diff --git a/include/NebulaService.h b/include/NebulaService.h
index c67456fb6f6..12b5e71a95a 100644
--- a/include/NebulaService.h
+++ b/include/NebulaService.h
@@ -150,7 +150,7 @@ class NebulaService
      */
     static std::string code_version()
     {
-        return "6.99.80"; // bump version
+        return "6.9.80"; // bump version
     }
 
     /**
@@ -159,7 +159,7 @@ class NebulaService
      */
     static std::string shared_db_version()
     {
-        return "7.0.0";
+        return "6.10.0";
     }
 
     /**
@@ -168,7 +168,7 @@ class NebulaService
      */
     static std::string local_db_version()
     {
-        return "7.0.0";
+        return "6.10.0";
     }
 
     /**
diff --git a/share/onegate/onegate b/share/onegate/onegate
index f2628b4f19f..4c2c336dbee 100755
--- a/share/onegate/onegate
+++ b/share/onegate/onegate
@@ -29,7 +29,7 @@ require 'pp'
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.99.80'
+    VERSION = '6.9.80'
 
     # #########################################################################
     # Default location for the authentication file
diff --git a/share/oneprovision/ansible/roles/opennebula-repository/defaults/main.yml b/share/oneprovision/ansible/roles/opennebula-repository/defaults/main.yml
index 5d1a0652c2d..d158dba7afc 100644
--- a/share/oneprovision/ansible/roles/opennebula-repository/defaults/main.yml
+++ b/share/oneprovision/ansible/roles/opennebula-repository/defaults/main.yml
@@ -5,7 +5,7 @@
 ###############################################################################
 
 # OpenNebula repository version
-opennebula_repository_version: '7.0.0'
+opennebula_repository_version: '6.10.0'
 
 # Repository of the OpenNebula packages
 opennebula_repository_base: 'https://downloads.opennebula.io/repo/{{ opennebula_repository_version }}'
diff --git a/share/rubygems/generate b/share/rubygems/generate
index d4297dfb055..2dd60599546 100755
--- a/share/rubygems/generate
+++ b/share/rubygems/generate
@@ -19,7 +19,7 @@
 require 'fileutils'
 require 'tmpdir'
 
-VERSION = '6.99.80'
+VERSION = '6.9.80'
 
 def version
     v = VERSION
diff --git a/src/cloud/common/CloudClient.rb b/src/cloud/common/CloudClient.rb
index 0d71a57e765..2a741a90dfa 100644
--- a/src/cloud/common/CloudClient.rb
+++ b/src/cloud/common/CloudClient.rb
@@ -51,7 +51,7 @@
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.99.80'
+    VERSION = '6.9.80'
 
     # #########################################################################
     # Default location for the authentication file
diff --git a/src/im_mad/remotes/VERSION b/src/im_mad/remotes/VERSION
index 3b87f1332f4..a109fefec9c 100644
--- a/src/im_mad/remotes/VERSION
+++ b/src/im_mad/remotes/VERSION
@@ -1 +1 @@
-6.99.80
\ No newline at end of file
+6.9.80
diff --git a/src/oca/java/src/org/opennebula/client/OneSystem.java b/src/oca/java/src/org/opennebula/client/OneSystem.java
index ba5669f0566..f2552f189b7 100644
--- a/src/oca/java/src/org/opennebula/client/OneSystem.java
+++ b/src/oca/java/src/org/opennebula/client/OneSystem.java
@@ -32,7 +32,7 @@ public class OneSystem
     private static final String GROUP_QUOTA_INFO    = "groupquota.info";
     private static final String GROUP_QUOTA_UPDATE  = "groupquota.update";
 
-    public static final String VERSION = "6.99.80";
+    public static final String VERSION = "6.9.80";
 
     public OneSystem(Client client)
     {
diff --git a/src/oca/python/setup.py b/src/oca/python/setup.py
index 983ce6579d3..624c6fbff00 100644
--- a/src/oca/python/setup.py
+++ b/src/oca/python/setup.py
@@ -36,7 +36,7 @@
 if sys.version_info[0] < 3:
     install_requires.append('future')
 
-version = '6.99.80'
+version = '6.9.80'
 
 # mark pre-release
 v1 = int(version.split('.')[1])
diff --git a/src/oca/ruby/opennebula.rb b/src/oca/ruby/opennebula.rb
index bd58b7b7091..3cfa3b9eca1 100644
--- a/src/oca/ruby/opennebula.rb
+++ b/src/oca/ruby/opennebula.rb
@@ -79,5 +79,5 @@
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '6.99.80'
+    VERSION = '6.9.80'
 end
diff --git a/src/onecfg/lib/version.rb b/src/onecfg/lib/version.rb
index 5fa40f9dc3b..19f9b0dcc47 100644
--- a/src/onecfg/lib/version.rb
+++ b/src/onecfg/lib/version.rb
@@ -16,6 +16,6 @@
 
 module OneCfg
 
-    VERSION = '6.99.80'
+    VERSION = '6.9.80'
 
 end
diff --git a/src/onedb/database_schema.rb b/src/onedb/database_schema.rb
index 7edfa7e4b7d..bb73dda4923 100644
--- a/src/onedb/database_schema.rb
+++ b/src/onedb/database_schema.rb
@@ -140,8 +140,8 @@ class OneDBBacKEnd
         }
     }
 
-    LATEST_DB_VERSION = '7.0.0'
-    LATEST_LOCAL_DB_VERSION = '7.0.0'
+    LATEST_DB_VERSION = '6.10.0'
+    LATEST_LOCAL_DB_VERSION = '6.10.0'
 
     def get_schema(type, version = nil)
         if !version
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index e0039717ce4..7465c17a71c 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -319,7 +319,7 @@
     :author_name => "OpenNebula Support Team",
     :support_subscription => "https://opennebula.io/support/",
     :account => "https://opennebula.io/buy-support",
-    :docs => "https://docs.opennebula.io/6.99/",
+    :docs => "https://docs.opennebula.io/6.9/",
     :community => "https://opennebula.io/usec",
     :project => "OpenNebula"
 }