diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 98f900f..2284dbe 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -31,11 +31,13 @@ jobs:
         run: |
           echo VERSION=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^[[:xdigit:]]\{40\}[[:blank:]]refs\/tags\/\([0-9]\{1\}\.[0-9]\{1,2\}\($\|\.[0-9]\{1,2\}$\)\)/\1/p" | sort --version-sort | tail -1) | tee -a $GITHUB_OUTPUT
           echo IMAGE_CREATED=$(date -u +"%Y-%m-%dT%H:%M:%SZ") | tee -a $GITHUB_OUTPUT
+
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           context: ./StableV2
           file: StableV2/Dockerfile
+          platforms: linux/amd64
           pull: false
           push: true
           no-cache: true
@@ -68,13 +70,15 @@ jobs:
       - name: Get Meta
         id: meta
         run: |
-          echo VERSION=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^[[:xdigit:]]\{40\}[[:blank:]]refs\/tags\/\([0-9]\{1\}\.[0-9]\{1,2\}\($\|\.[0-9]\{1,2\}$\)\)/\1/p" | sort --version-sort | tail -1) | tee -a $GITHUB_OUTPUT
+          echo VERSION=$(curl -s https://rspamd.com/apt/pool/main/r/rspamd/ | sed -n "s/^<a href=\"rspamd_\(.*\)\~git.*\~.*.dsc\".*/\1/p" | tail -1) | tee -a $GITHUB_OUTPUT
           echo IMAGE_CREATED=$(date -u +"%Y-%m-%dT%H:%M:%SZ") | tee -a $GITHUB_OUTPUT
+
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           context: ./Experimental
           file: Experimental/Dockerfile
+          platforms: linux/amd64
           pull: false
           push: true
           no-cache: true
diff --git a/Experimental/Dockerfile b/Experimental/Dockerfile
index 3fb92d7..7963886 100644
--- a/Experimental/Dockerfile
+++ b/Experimental/Dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer="gnilebein - <patrick@niebel.ing>"
 
 # Setup Labels
 ARG VERSION
-ARG DATE
+ARG IMAGE_CREATEDATE
 
 # Set apt non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/StableV2/Dockerfile b/StableV2/Dockerfile
index 96ac7db..db709b3 100644
--- a/StableV2/Dockerfile
+++ b/StableV2/Dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer="gnilebein - <patrick@niebel.ing>"
 
 # Setup Labels
 ARG VERSION
-ARG DATE
+ARG IMAGE_CREATED
 
 # Set apt non-interactive
 ENV DEBIAN_FRONTEND=noninteractive