diff --git a/.github/workflows/dockerhub_push.yml b/.github/workflows/dockerhub_push.yml
index 5913a7ce..e33ac5cf 100644
--- a/.github/workflows/dockerhub_push.yml
+++ b/.github/workflows/dockerhub_push.yml
@@ -2,14 +2,14 @@ name: Build and publish docker image
 on:
   push:
     # disable push new image on merge to master (because we don't want to push a "master" tag)
-    # branches:
-    #   - 'master'
+#     branches:
+#       - 'master'
     # on every tags push, we will publish both the latest tag and the versioned tag (semver)
-    tags:
-      - 'v*'
+#    tags:
+#      - 'v*'
 
   # Disabled: Allows you to run this workflow manually from the Actions tab (because auto tagging won't work)
-  # workflow_dispatch:
+   workflow_dispatch:
 
 jobs:
   # ====== Todos Backend (build and deploy) ======
@@ -31,32 +31,42 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@0.8.0
+        with:
+          scan-type: 'fs'
+          exit-code: '1'
+          security-checks: 'vuln,secret'
+          trivy-config: trivy-secret.yaml
+
       -
         name: Docker meta
         id: meta
         uses: docker/metadata-action@v3
         with:
-          images: permitio/pdp
+          images: permitio/pdp-v2
           tags: |
             type=ref,event=branch
             type=semver,pattern={{version}}
+            type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
       -
         name: Echo published tags
         run: |
           echo "Published docker tags: ${{ steps.meta.outputs.tags }}"
-      -
-        name: Build image and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          context: .
-          file: ./Dockerfile
-          #All available platforms: linux/arm64,linux/amd64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
-          platforms: linux/arm64,linux/amd64
-          build-args: |
-            READ_ONLY_GITHUB_TOKEN=${{ secrets.READ_ONLY_GITHUB_TOKEN }}
-      -
-        name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+#      -
+#        name: Build image and push
+#        id: docker_build
+#        uses: docker/build-push-action@v2
+#        with:
+#          push: true
+#          tags: ${{ steps.meta.outputs.tags }}
+#          context: .
+#          file: ./Dockerfile
+#          #All available platforms: linux/arm64,linux/amd64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
+#          platforms: linux/arm64,linux/amd64
+#          build-args: |
+#            READ_ONLY_GITHUB_TOKEN=${{ secrets.READ_ONLY_GITHUB_TOKEN }}
+#      -
+#        name: Image digest
+#        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/ecr_push.yml b/.github/workflows/ecr_push.yml
new file mode 100644
index 00000000..12abb41a
--- /dev/null
+++ b/.github/workflows/ecr_push.yml
@@ -0,0 +1,60 @@
+name: Build and publish docker image to ECR
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-and-publish-image:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+      - name: AWS Auth - Assume OIDC Github Role
+        uses: aws-actions/configure-aws-credentials@v1.6.1
+        with:
+          role-to-assume: ${{ secrets.ROLE_ARN }}
+          aws-region: ${{ env.AWS_REGION }}
+          role-session-name: githubactions
+
+      - name: Amazon ECR Login - Root Account
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: permitio/pdp
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+      -
+        name: Echo published tags
+        run: |
+          echo "Published docker tags: ${{ steps.meta.outputs.tags }}"
+      -
+        name: Build image and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+
+          context: .
+          file: ./Dockerfile
+          platforms: linux/arm64,linux/amd64
+          build-args: |
+            READ_ONLY_GITHUB_TOKEN=${{ secrets.READ_ONLY_GITHUB_TOKEN }}
+      -
+        name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/Dockerfile b/Dockerfile
index b31e3e80..bdcdb43f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-get update && \
 
 RUN groupadd -r permit
 RUN useradd -m -s /bin/bash -g permit -d /home/permit permit
-
+RUN export asdfaspermit_key_asdfasdfasdf
 # copy libraries from build stage
 RUN mkdir /home/permit/.local
 COPY --from=BuildStage /root/.local /home/permit/.local
diff --git a/trivy-secret.yaml b/trivy-secret.yaml
new file mode 100644
index 00000000..904eb00f
--- /dev/null
+++ b/trivy-secret.yaml
@@ -0,0 +1,7 @@
+rules:
+  - id: permit_api_key_rule
+    category: general
+    title: Permit Api Key Rule
+    severity: CRITICAL
+    regex: .(?i)(?P<key>(permit_key))(=|_)(?P<secret>[0-9a-zA-Z\-_=]{8,64})
+    secret-group-name: secret