diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9ce6575..2336033 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,6 +55,9 @@ jobs:
             ${{ steps.generate-tags.outputs.date }}
             ${{ steps.generate-tags.outputs.sha_short }}
           oci: true
+          extra-args: |
+            --rewrite-timestamp
+            --source-date-epoch=1321009871
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v4
diff --git a/Justfile b/Justfile
index 0ab767e..465c277 100644
--- a/Justfile
+++ b/Justfile
@@ -6,7 +6,10 @@ just := just_executable()
 build:
     git submodule update --init --recursive
     git submodule update --remote
-    podman build -t localhost/aurora-common:latest -f ./Containerfile .
+    podman build \
+      --rewrite-timestamp \
+      --source-date-epoch=$(git log -1 --pretty=%ct) \
+      -t localhost/aurora-common:latest -f ./Containerfile .
 
 # Check the syntax of all Justfiles in the repository
 check: