diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e22e02..3d362ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,9 @@ stages:
   - deploy
   - ops
 
-.imageTag: &IMAGE_TAG $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+variables:
+  VERSION: 4.2.0-$CI_COMMIT_SHORT_SHA
+  IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
 
 Build:
   stage: build
@@ -16,7 +18,7 @@ Build:
   script:
     - dotnet restore
     - dotnet test Tests
-    - dotnet publish --version-suffix ${CI_COMMIT_SHA:0:8} -r linux-x64 -c Release -o ./app ./Geekbot.net/
+    - dotnet publish --version-suffix $VERSION -r linux-x64 -c Release -o ./app ./Geekbot.net/
 
 Package:
   stage: docker
@@ -25,8 +27,6 @@ Package:
     - master
   services:
     - docker:stable-dind
-  variables:
-    IMAGE_TAG: *IMAGE_TAG
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - docker build -t $IMAGE_TAG .
@@ -39,7 +39,6 @@ Deploy:
     - master
   variables:
     ANSIBLE_NOCOWS: 1
-    IMAGE_TAG: *IMAGE_TAG
   before_script:
     - mkdir /root/.ssh
     - cp $SSH_PRIVATE_KEY /root/.ssh/id_ed25519
@@ -56,9 +55,9 @@ Sentry:
   only:
     - master
   script:
-    - sentry-cli releases new -p geekbot 4.2.0-${CI_COMMIT_SHA:0:8}
-    - sentry-cli releases set-commits --auto 4.2.0-${CI_COMMIT_SHA:0:8}
-    - sentry-cli releases deploys 4.2.0-${CI_COMMIT_SHA:0:8} new -e Production
+    - sentry-cli releases new -p geekbot $VERSION
+    - sentry-cli releases set-commits --auto $VERSION
+    - sentry-cli releases deploys $VERSION new -e Production
 
 Github Mirror:
   stage: ops
diff --git a/Geekbot.net/Geekbot.net.csproj b/Geekbot.net/Geekbot.net.csproj
index 37dc310..006e6cb 100755
--- a/Geekbot.net/Geekbot.net.csproj
+++ b/Geekbot.net/Geekbot.net.csproj
@@ -4,10 +4,9 @@
     <TargetFramework>net5.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
     <ApplicationIcon>derp.ico</ApplicationIcon>
-    <Version>4.2.0</Version>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
-    <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
-    <Version Condition=" '$(VersionSuffix)' == '' ">$(Version)-DEV</Version>
+    <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</Version>
+    <Version Condition=" '$(VersionSuffix)' == '' ">0.0.0-DEV</Version>
     <Company>Pizza and Coffee Studios</Company>
     <Authors>Pizza and Coffee Studios</Authors>
     <Description>A Discord bot</Description>