diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
index 8879e39..2eebfb1 100644
--- a/.github/workflows/development.yml
+++ b/.github/workflows/development.yml
@@ -13,13 +13,26 @@ jobs:
   build-container:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Log in to Docker Hub
-      uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Build Image
-      run: docker build -t alexohneander/cert-fixer:${{ env.RELEASE_VERSION }} .
-    - name: Push Image version
-      run: docker push alexohneander/cert-fixer:${{ env.RELEASE_VERSION }}
\ No newline at end of file
+        - name: Check out the repo
+          uses: actions/checkout@v3
+        
+        - name: Log in to Docker Hub
+          uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+          with:
+            username: ${{ secrets.DOCKER_USERNAME }}
+            password: ${{ secrets.DOCKER_PASSWORD }}
+        
+        - name: Extract metadata (tags, labels) for Docker
+          id: meta
+          uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+          with:
+            images: alexohneander/cert-fixer
+        
+        - name: Build and push Docker image
+          uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+          with:
+            context: .
+            file: ./Dockerfile
+            push: true
+            tags: ${{ steps.meta.outputs.tags }}
+            labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file