diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml
index 8f60a10..6f18b43 100644
--- a/.github/workflows/build_pkg.yml
+++ b/.github/workflows/build_pkg.yml
@@ -38,6 +38,12 @@ on:
       message:
         type: string
         default: ""
+      git_filter:
+        type: string
+        default: ""
+      git_tag_match:
+        type: string
+        default: ""
 jobs:
   source:
     name: source package
diff --git a/container/apt/apt.conf.d/00default-release b/container/apt/apt.conf.d/00default-release
deleted file mode 100644
index 6d8ece5..0000000
--- a/container/apt/apt.conf.d/00default-release
+++ /dev/null
@@ -1 +0,0 @@
-APT::Default-Release "testing";
\ No newline at end of file
diff --git a/container/apt/preferences.d/gardenlinux b/container/apt/preferences.d/gardenlinux
new file mode 100644
index 0000000..2f4e912
--- /dev/null
+++ b/container/apt/preferences.d/gardenlinux
@@ -0,0 +1,3 @@
+Package: *
+Pin: release o=Gardenlinux
+Pin-Priority: 700
\ No newline at end of file
diff --git a/container/apt/sources.list.d/gardenlinux.sources b/container/apt/sources.list.d/gardenlinux.sources
new file mode 100644
index 0000000..5f1fe4e
--- /dev/null
+++ b/container/apt/sources.list.d/gardenlinux.sources
@@ -0,0 +1,4 @@
+Types: deb
+URIs: http://repo.gardenlinux.io/gardenlinux
+Suites: today
+Components: main
\ No newline at end of file
diff --git a/container/apt/trusted.gpg.d/gardenlinux.asc b/container/apt/trusted.gpg.d/gardenlinux.asc
new file mode 100644
index 0000000..48146db
--- /dev/null
+++ b/container/apt/trusted.gpg.d/gardenlinux.asc
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGN3UG4BEACUPRC/gZekjtoaszk7+TdJUi4E6U9asuUu2p9TvXpItQHcjBc4
+XZhKvrtJotft/KJQf7/hkS587QfaRzMqzIJe7WC3ttm/SWNQee9VDUOzNCBaIPrq
+9iv0wZn+UtfbnKqUj8oknuo4BIKBdMJML4WiAsueP2wIrl0K37axoXfBFRXXmIhd
+48xZKGw3MeoZKhv5buATwv7tnJAlWXmSAn1lJolVhcdsl6npN1RPWAUPbhUoeaYQ
+zA2crak8PSe9B2foCoJ/7a4wtN4f9aI2+XYbMa97/9UzbcH8c1Cx4hSQpc7p0Csf
+5Ig0h/dLAFQ11xPbCgchh6EqZY46327H5vEXxhNVOAoQqIp+MEW12Gok6fDJX4Ts
+zA8k4X8w5SEdhCKd4sUBYU8CzlejXqykHRkqlYi/kR4qAUsbaNy3naIqGb+hdeSs
+1Ch7X5sXArK1ua6a2xTlzpV7UesQddR31XBxg1y8zuqkD4YhxbcLx9i27kC9pyYm
+5aCE215k9NXnmeBI80VsEWbfxRomwIZ4XK0QiVqOS8f/yQtU2dZbAOEEb5hPhLvK
+fhfFwBuLCuu4BQLBJCYX4tEvwtecXG31/3w+EbEBoFZ9HKRxIQgNM8u5pS4uKk9S
+fBJRbliCtyynOkTRRBy8nUgoPhHAIruBfVo5CiRF8j/NRnCjp5glPNTuoQARAQAB
+tEJHYXJkZW4gTGludXggQXV0b21hdGljIFNpZ25pbmcgS2V5ICgyMDIyKSA8Y29u
+dGFjdEBnYXJkZW5saW51eC5pbz6JAlQEEwEKAD4WIQTwpt05wx1W5TUPBqaLrXaj
+keK7UQUCY3dQbgIbLwUJBaOagAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCL
+rXajkeK7UTcQD/9/Jxg34xhrzUpOStFtxo9JrsAUc38rAUEbFL30LSX9DG5fCHff
+6MCOGSI9zenc95O3hXOFb9mlQJrEFc7oYlqePbxqXCstOvyavKw53KddEKrpp+zZ
+EIfbcXIsMh6c3G0fxPaAlFnjXprEzEDtPMfr3aa7fLZJENQbpOzyt//8AtFwYv2u
+3sEgYwPo07PQf60g7pIfkC6rkg3RexwMkhquh2gdBQo1I/jloWLsDhn+Hi+/zsbs
+ny/IC8YZl3iMu+5pY5eRL+Uu3lslA8IB6Pjp1x2kBIP6PeVANAg/5vXqq1qn8aoG
+z6+8JcIMDUETlnx19b6SqZd1shFlxlodU8qUtoAisk+WRoHCetkFSPvLr4EVloTb
+SUB7gHPBWqjrCP39lYPsN52fgBiG2Nko+bnU9BSPt5VIvYQfvX3gx0FXQbW1zeZ6
+gq4w3lWajqilmS5F8x2pBJAFdLZw7f5t4w0NoGA2edJEc51+JW0/BgKmImQOjiOg
+dD34FwP49P6orG14l/q3meKfJB0O660N09+liEHLo9zJtOUp8v+EwAjB81/LRLpV
+HNRHTVOxDJRDDC2wjbhN38BtfjnLKFz2S/hZNIDeqz53fSgpGftdiBNhLS8wI2E1
+ciUIHaRWRlvgpEo1KsHk3Knn+t+f+5Fxyi9Yj9QMU5Hi7zKex9hBDReBrA==
+=93j9
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/container/bin/build_source b/container/bin/build_source
index 2289de0..77ebfb8 100755
--- a/container/bin/build_source
+++ b/container/bin/build_source
@@ -20,6 +20,8 @@ main() (
 	debian_source="$(yq -r '.jobs.build_pkg.with.debian_source // "'$debian_source'"' < "$inputs_file")"
 	build_options="terse $(yq -r '.jobs.build_pkg.with.build_options // ""' < "$inputs_file")"
 	build_profiles="$(yq -r '.jobs.build_pkg.with.build_profiles // ""' < "$inputs_file")"
+	git_filter="$(yq -r '.jobs.build_pkg.with.git_filter // ".*"' < "$inputs_file")"
+	git_tag_match="$(yq -r '.jobs.build_pkg.with.git_tag_match // "(.*)"' < "$inputs_file")"
 
 	# Define Build Options
 	export DEB_BUILD_OPTIONS="$build_options"
@@ -83,7 +85,7 @@ main() (
 )
 
 apt_source() (
-	apt-get source --only-source --download-only "$1"
+	apt-get source -o APT::Default-Release="testing" --only-source --download-only "$1"
 	orig=(*.orig.tar.*)
 	debian=(*.debian.tar.*)
 	dsc=(*.dsc)
@@ -102,8 +104,8 @@ apt_source() (
 
 git_source() (
 	IFS='#' read -r url ref <<< "$1"
-	git clone --bare --branch "$ref" --depth 1 "$url" src.git
-	GIT_DIR=src.git git archive --prefix src/ "$ref" > orig.tar
+	git clone "$url" src.git
+	git -C src.git archive --prefix src/ "$(get_git_tag)" > orig.tar
 	rm -rf src.git
 	tar -x < orig.tar
 )
@@ -144,7 +146,15 @@ apply_patches() (
 	distribution="$(yq -r '.jobs.build_pkg.with.distribution // "'"$distribution"'"' < "$inputs_file")"
 	message="$(yq -r '.jobs.build_pkg.with.message // "'"$message"'"' < "$inputs_file")"
 
-	DEBEMAIL="$email" DEBFULLNAME="$maintainer" dch --newversion "$(get_version)" --distribution "$distribution" --force-distribution -- "$message"
+	if [ -f debian/changelog ]; then
+		DEBEMAIL="$email" DEBFULLNAME="$maintainer" dch \
+		--newversion "$(get_version)" --distribution "$distribution" \
+		--force-distribution -- "$message"
+	else
+		DEBEMAIL="$email" DEBFULLNAME="$maintainer" EDITOR=true dch --create --package $name \
+                --newversion "$(get_version)" --distribution "$distribution" \
+                --force-distribution -- "$message"
+	fi
 
 	if [ -x "$1/exec.post" ]; then
 		SOURCE="$source" "$1/exec.post"
@@ -152,27 +162,84 @@ apply_patches() (
 )
 
 get_sources() (
-	local source=$1
+	local source_type=$1
 
-	# What kind of source do we have?
-	if [[ "$source" = "git+"* ]]; then
+	# What kind of source type do we have?
+	if [[ "$source_type" = "git+"* ]]; then
 		git_source "${source#git+}"
-	elif [[ "$source" = "native" ]]; then
+	elif [[ "$source_type" = "native" ]]; then
 		native_source
 	else
-		apt_source "$source"
+		apt_source "$source_type"
 	fi
 )
 
+get_git_tag() (
+	local tag
+	if [ -z $PACKAGE_VERSION ]; then
+		tag=$(get_latest_git_tag)
+	else
+		tag=$(get_git_tag_by_version ${PACKAGE_VERSION%-0gardenlinux*})
+	fi
+	echo $tag
+)
+
+get_latest_git_tag() (
+	local latest_tag
+
+	IFS='#' read -r url ref <<< "${source#git+}"
+	latest_tag="$(git ls-remote --tags --refs $url | sed "s#.*\/##" | grep -E "$git_filter" | sort -V | tail -n1)"
+
+	echo $latest_tag
+)
+
+get_version_by_git_tag() (
+	local version tag
+	tag=$1
+
+	version=$(echo $tag | sed -E "s#$git_tag_match#\1#")
+	echo $version
+)
+
+get_git_tag_by_version() (
+	local tag tags version
+	version=$1
+
+	IFS='#' read -r url ref <<< "${source#git+}"
+	tags=$(git ls-remote --tags --refs $url | sed "s#.*\/##" | grep -E "$git_filter")
+
+	for t in $tags; do
+		if [ "$(get_version_by_git_tag $t)" == "$version" ]; then
+			echo $t
+			exit 0
+		fi
+	done
+)
+
+get_upstream_version() (
+	local source_type=$1
+	local upstream_version
+
+	# What kind of source type do we have?
+	if [[ "$source_type" = "git+"* ]]; then
+		latest_tag=$(get_latest_git_tag)
+		upstream_version="$(get_version_by_git_tag $latest_tag)-0"
+	else
+		upstream_version=$(dpkg-parsechangelog --show-field Version)
+	fi
+
+	echo $upstream_version
+)
+
 get_version() (
 	local version=$PACKAGE_VERSION
 
 	# If version is undefined, let's simply use
 	# the version of the upstream package and add 
 	# the git tag to it.
-	if [ -z "$version" ]; then
-		package_version=$(dpkg-parsechangelog --show-field Version)
+	if [ -z $version ]; then
 		commit_hash=$(git -C /input rev-parse HEAD)
+		package_version=$(get_upstream_version $source)
 
 		# No version has been provided. Check if there is already a Garden Linux version 0
 		# if not, the current package will be the first one. Otherwise, simply use the commit hash.