diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c115cde7aa27fc68836425f4a233070492516c32..9e2370d0dc2749adc2785cdb3f74b1b86a0cc30f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,8 +42,8 @@ build:deb:
   script:
     - export commit=$(git log -n 1 --oneline | sed 's/ .*$//')
     - export version=$(sed -ne 's/^[^(]*(\([^)]*\)).*/\1/;1p' debian/changelog)
-
-
+    - export new_version="${version}+${CI_BUILD_ID}.${commit}"
+    - dch -D unstable --newversion "$new_version" "automatic GitLab CI build ${CI_BUILD_ID}"
     - dpkg-buildpackage
     - mkdir build
     - mv -v ../aegir3*.deb build/
diff --git a/aegir-release.make b/aegir-release.make
index 503d390cd7085ddb7265504180ce43b7ce43028e..d59e783ccc6726c23c47a7ad8c0ef53b9d84e6a4 100644
--- a/aegir-release.make
+++ b/aegir-release.make
@@ -7,5 +7,5 @@ projects[drupal][type] = "core"
 ; The release.sh script updates the version of hostmaster.
 projects[hostmaster][type] = "profile"
 projects[hostmaster][download][type] = "git"
-projects[hostmaster][download][tag] = "7.x-3.130"
+projects[hostmaster][download][tag] = "7.x-3.0-dev"
 projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git"
diff --git a/aegir.make b/aegir.make
deleted file mode 120000
index f6e35b975feae015d21a03f4812e212d0079b010..0000000000000000000000000000000000000000
--- a/aegir.make
+++ /dev/null
@@ -1 +0,0 @@
-aegir-release.make
\ No newline at end of file
diff --git a/aegir.make b/aegir.make
new file mode 100644
index 0000000000000000000000000000000000000000..d1357cc84ef36ce883a105d1a5d6da21cc190ab1
--- /dev/null
+++ b/aegir.make
@@ -0,0 +1,10 @@
+core = 7.x
+api = 2
+
+projects[drupal][type] = "core"
+
+projects[hostmaster][type] = "profile"
+projects[hostmaster][download][type] = "git"
+projects[hostmaster][download][url] = "http://git.drupal.org/project/hostmaster.git"
+projects[hostmaster][download][branch] = "7.x-3.x"
+
diff --git a/provision.info b/provision.info
index 3741d7004443953b546010cab41806fabbe07c59..6f0191608fab3199092e85ac1c82308fcadba9a7 100644
--- a/provision.info
+++ b/provision.info
@@ -1,4 +1,4 @@
 name=Provision
 description="Aegir backend"
 
-version=7.x-3.130
+version=7.x-3.x
diff --git a/upgrade.sh.txt b/upgrade.sh.txt
index cb5fa5c727917532ef47b5c7f772d035dfa199b7..c325c3f3b40dc75d0c56296040827970ce4d285f 100644
--- a/upgrade.sh.txt
+++ b/upgrade.sh.txt
@@ -9,7 +9,7 @@
 ########################################################################
 
 # Basic variables, change before running.
-AEGIR_VERSION="7.x-3.130"
+AEGIR_VERSION="7.x-3.x"
 NEW_DRUSH_VERSION="stable"  # e.g stable, unstable, ignore or a version number like 8.1.3
 
 # Extra variables, no changes needed for most use-cases.