diff --git a/.github/workflows/docker-image-development.yml b/.github/workflows/docker-image-development.yml
index 96d98f8..59564d3 100644
--- a/.github/workflows/docker-image-development.yml
+++ b/.github/workflows/docker-image-development.yml
@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Build the Docker image
       run: | 
-          docker build . -t defuj/apkt-eis:dev-${{ github.run_number }}
-          docker push defuj/apkt-eis:dev-${{ github.run_number }}
+          docker build . -t defuj/apkt-eis:v0.0.${{ github.run_number }}-dev
+          docker push defuj/apkt-eis:v0.0.${{ github.run_number }}-dev
 
     
diff --git a/.github/workflows/docker-image-release.yml b/.github/workflows/docker-image-release.yml
index 2d6aebb..e4bd088 100644
--- a/.github/workflows/docker-image-release.yml
+++ b/.github/workflows/docker-image-release.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Build the Docker image
       run: | 
           docker build . -t defuj/apkt-eis
-          docker image tag defuj/apkt-eis defuj/apkt-eis:release-$(date +%s)
-          docker push defuj/apkt-eis:release-$(date +%s)
+          docker image tag defuj/apkt-eis defuj/apkt-eis:v1.0.${{ github.run_number }}-release
+          docker push defuj/apkt-eis:v1.0.${{ github.run_number }}-release