diff --git a/changelogs/glusterfs/changelog-1 b/releases/1.0.x/changelogs/glusterfs
similarity index 62%
rename from changelogs/glusterfs/changelog-1
rename to releases/1.0.x/changelogs/glusterfs
index 08d7c8b..dbf3f5d 100644
--- a/changelogs/glusterfs/changelog-1
+++ b/releases/1.0.x/changelogs/glusterfs
@@ -1,3 +1,10 @@
+kadalu-storage (1.0.0-1) UNRELEASED; urgency=low
+
+  * First GA release
+  * Based on GlusterFS 11.0 release
+
+ -- Kadalu Technologies Pvt Limited <packaging@kadalu.tech>  Wed, 30 Nov 2022 07:07:07 +0530
+
 kadalu-storage (1.0.0-beta.2-1) UNRELEASED; urgency=low
 
   * Beta 2 release
diff --git a/changelogs/moana/changelog-1 b/releases/1.0.x/changelogs/moana
similarity index 55%
rename from changelogs/moana/changelog-1
rename to releases/1.0.x/changelogs/moana
index 08059c8..b8c2dbc 100644
--- a/changelogs/moana/changelog-1
+++ b/releases/1.0.x/changelogs/moana
@@ -1,3 +1,10 @@
+kadalu-storage-manager (1.0.0-1) UNRELEASED; urgency=low
+
+  * First GA release of Kadalu Storage manager
+  * Full list of Changes here https://github.com/kadalu/moana/blob/main/CHANGELOG.adoc
+
+ -- Kadalu Technologies Pvt Limited <packaging@kadalu.tech>  Wed, 30 Nov 2022 07:07:10 +0530
+
 kadalu-storage-manager (1.0.0-beta.2-1) UNRELEASED; urgency=low
 
   * Beta 2 release
diff --git a/src/1.0.x/ubuntu-22.04.t b/releases/1.0.x/ubuntu-22.04.t
similarity index 83%
rename from src/1.0.x/ubuntu-22.04.t
rename to releases/1.0.x/ubuntu-22.04.t
index b224c36..11870e3 100644
--- a/src/1.0.x/ubuntu-22.04.t
+++ b/releases/1.0.x/ubuntu-22.04.t
@@ -1,9 +1,9 @@
 # -*- mode: ruby -*-
 PACKAGING_GPG_SIGNING_KEY = ENV["PACKAGING_GPG_SIGNING_KEY"]
-PKG_VERSION = ENV.fetch("PKG_VERSION", "1.0.0-beta.2")
-MOANA_TAG = ENV.fetch("MOANA_TAG", "1.0.0-beta.2")
-GLUSTERFS_BRANCH = ENV.fetch("GLUSTERFS_BRANCH", "kadalu_1")
-MAJOR_VERSION = "1"
+PKG_VERSION = ENV["PKG_VERSION"]
+MOANA_TAG = PKG_VERSION
+GLUSTERFS_TAG = "k#{PKG_VERSION}"
+VERSION_DIR = "#{PKG_VERSION.split(".")[0]}.#{PKG_VERSION.split(".")[1]}.x"
 DISTRO_VERSION = "22.04"
 DISTRO = "ubuntu"
 
@@ -50,7 +50,7 @@ TEST "docker ps"
 containers.each do |container|
   USE_NODE "local"
   # Copy the sources, script and checkout the required branches
-  TEST %{docker cp changelogs #{container}:/root/}
+  TEST %{docker cp #{VERSION_DIR}/changelogs #{container}:/root/}
   TEST "docker cp build #{container}:/root/"
 
   USE_NODE container
@@ -78,16 +78,16 @@ containers.each do |container|
   TEST "cd /root/build/moana && git checkout -b #{MOANA_TAG} tags/#{MOANA_TAG}"
   TEST "mv /root/build/moana /root/build/#{pkg1}"
   TEST "cd /root/build/ && tar cvzf #{pkg1}.tar.gz #{pkg1}"
-  TEST "cp /root/changelogs/moana/changelog-#{MAJOR_VERSION} /root/build/#{pkg1}/packaging/moana/debian/changelog"
+  TEST "cp /root/changelogs/moana /root/build/#{pkg1}/packaging/moana/debian/changelog"
   TEST "cp -r /root/build/#{pkg1}/packaging/moana/debian /root/build/#{pkg1}/"
   TEST "cd /root/build/#{pkg1} && debmake -b\":python3\" && debuild -eVERSION=#{PKG_VERSION}"
 
   # Build GlusterFS
   pkg2 = "kadalu-storage-#{PKG_VERSION}"
-  TEST "cd /root/build/glusterfs && git checkout -b #{GLUSTERFS_BRANCH} origin/#{GLUSTERFS_BRANCH}"
+  TEST "cd /root/build/glusterfs && git checkout -b #{GLUSTERFS_TAG} tags/#{GLUSTERFS_TAG}"
   TEST "mv /root/build/glusterfs /root/build/#{pkg2}"
   TEST "cd /root/build/ && tar cvzf #{pkg2}.tar.gz #{pkg2}"
-  TEST "cp /root/changelogs/glusterfs/changelog-#{MAJOR_VERSION} /root/build/#{pkg1}/packaging/glusterfs/debian/changelog"
+  TEST "cp /root/changelogs/glusterfs /root/build/#{pkg1}/packaging/glusterfs/debian/changelog"
   # Copy debian directory from moana repo to build root of respective package
   TEST "cp -r /root/build/#{pkg1}/packaging/glusterfs/debian /root/build/#{pkg2}/"
   TEST "cd /root/build/#{pkg2} && debmake -b\":python3\" && debuild -eVERSION=#{PKG_VERSION}"
@@ -122,7 +122,7 @@ TEST "cd /root/packages && apt-ftparchive release . > Release"
 TEST "cd /root/packages && gpg --local-user \"packaging@kadalu.tech\" -abs -o - Release > Release.gpg"
 TEST "cd /root/packages && gpg --local-user \"packaging@kadalu.tech\" --clearsign -o - Release > InRelease"
 TEST "cd /root/packages && gpg --armor --export \"packaging@kadalu.tech\" > KEY.gpg"
-TEST "echo \"deb https://kadalu.tech/pkgs/#{MAJOR_VERSION}/#{DISTRO}/#{DISTRO_VERSION} ./\" > sources.list"
+TEST "echo \"deb https://kadalu.tech/pkgs/#{VERSION_DIR}/#{DISTRO}/#{DISTRO_VERSION} ./\" > sources.list"
 
 USE_NODE "local"
 
@@ -130,9 +130,9 @@ USE_NODE "local"
 TEST "rm -rf ./output"
 TEST "git clone https://github.com/kadalu-tech/pkgs.git output"
 TEST "cd output && git checkout -b gh-pages origin/gh-pages"
-TEST "rm -rf output/#{MAJOR_VERSION}/#{DISTRO}/#{DISTRO_VERSION}"
-TEST "mkdir -p output/#{MAJOR_VERSION}/#{DISTRO}/#{DISTRO_VERSION}"
-TEST "docker cp #{containers[0]}:/root/packages/. output/#{MAJOR_VERSION}/#{DISTRO}/#{DISTRO_VERSION}/"
+TEST "rm -rf output/#{VERSION_DIR}/#{DISTRO}/#{DISTRO_VERSION}"
+TEST "mkdir -p output/#{VERSION_DIR}/#{DISTRO}/#{DISTRO_VERSION}"
+TEST "docker cp #{containers[0]}:/root/packages/. output/#{VERSION_DIR}/#{DISTRO}/#{DISTRO_VERSION}/"
 TEST "rm -rf output/.git*"
-TEST "chmod -R 777 output/#{MAJOR_VERSION}/#{DISTRO}/#{DISTRO_VERSION}/*"
-TEST "ls output/#{MAJOR_VERSION}/#{DISTRO}/#{DISTRO_VERSION}/"
+TEST "chmod -R 777 output/#{VERSION_DIR}/#{DISTRO}/#{DISTRO_VERSION}/*"
+TEST "ls output/#{VERSION_DIR}/#{DISTRO}/#{DISTRO_VERSION}/"
diff --git a/runner.sh b/runner.sh
index 58e4afb..b5186e9 100755
--- a/runner.sh
+++ b/runner.sh
@@ -4,7 +4,7 @@ dist=$2
 major_version=$(cut -d "." -f 1 <<< $version)
 minor_version=$(cut -d "." -f 2 <<< $version)
 
-FILE=src/${major_version}.${minor_version}.x/${dist}.t
+FILE=releases/${major_version}.${minor_version}.x/${dist}.t
 if [ -f "$FILE" ]; then
     echo "Version: ${version} Runner: ${FILE}"
     PKG_VERSION=${version} PACKAGING_GPG_SIGNING_KEY=${PACKAGING_GPG_SIGNING_KEY} \