diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 793d8e0..986e715 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -15,4 +15,18 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
+      run:
+        IMAGE_ID=ghcr.io/${{ github.repository_owner }}/dvwa
+        IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+        VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+        [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+        [ "$VERSION" == "master" ] && VERSION=latest
+        COMMIT=$(echo "${{ github.sha }}" | cut -c 1-7)
+        echo IMAGE_ID=$IMAGE_ID
+        echo VERSION=$VERSION
+        echo COMMIT=$COMMIT
+        docker image build --tag dvwa .
+        docker image tag dvwa $IMAGE_ID:$VERSION
+        docker image tag dvwa $IMAGE_ID:$COMMIT
+        docker image push $IMAGE_ID:$VERSION
+        docker image push $IMAGE_ID:$COMMIT