diff --git a/.github/workflows/containers-push-upstream-to-ghcr.yml b/.github/workflows/containers-push-upstream-to-ghcr.yml
index 5f4d579e8a..3a63931213 100644
--- a/.github/workflows/containers-push-upstream-to-ghcr.yml
+++ b/.github/workflows/containers-push-upstream-to-ghcr.yml
@@ -17,12 +17,15 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - name: postgrest/postgrest:v12.2.12
+          - name: postgrest/postgrest
             short-name: postgrest
-          - name: ghcr.io/gsa-tts/clamav-rest/clamav:latest
+            tag: v12.2.12
+          - name: ghcr.io/gsa-tts/clamav-rest/clamav
             short-name: clamav
-          - name: metabase/metabase:v0.63.16.7
+            tag: latest 
+          - name: metabase/metabase
             short-name: metabase
+            tag: v0.64.3
 
     steps:
       - name: Checkout
@@ -33,7 +36,7 @@ jobs:
         uses: docker/setup-buildx-action@v4
 
       - name: Pull Docker Image
-        run: docker pull ${{ matrix.image.name }}
+        run: docker pull ${{ matrix.image.name }}:${{ matrix.image.tag }}
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25  # v0.36.0
@@ -44,7 +47,7 @@ jobs:
           TRIVY_SKIP_JAVA_DB_UPDATE: true
           TRIVY_DISABLE_VEX_NOTICE: true
         with:
-          image-ref: '${{ matrix.image.name }}'
+          image-ref: '${{ matrix.image.name }}:${{ matrix.image.tag }}'
           scan-type: 'image'
           hide-progress: false
           exit-code: 1
@@ -57,8 +60,9 @@ jobs:
       - name: Tag Image
         run: |
           date=$(date +%Y%m%d)
-          docker tag ${{ matrix.image.name }} ghcr.io/${{ env.GH_REPO }}/${{ matrix.image.short-name }}:latest
-          docker tag ${{ matrix.image.name }} ghcr.io/${{ env.GH_REPO }}/${{ matrix.image.short-name }}:$date
+          docker tag ${{ matrix.image.name }}:${{ matrix.image.tag }} ghcr.io/${{ env.GH_REPO }}/${{ matrix.image.short-name }}:latest
+          docker tag ${{ matrix.image.name }}:${{ matrix.image.tag }} ghcr.io/${{ env.GH_REPO }}/${{ matrix.image.short-name }}:$date
+          docker tag ${{ matrix.image.name }}:${{ matrix.image.tag }} ghcr.io/${{ env.GH_REPO }}/${{ matrix.image.short-name }}:${{ matrix.image.tag }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v4.7.0
diff --git a/backend/docker-compose.metabase.yml b/backend/docker-compose.metabase.yml
index 8d9e95ca0a..47a72111b2 100644
--- a/backend/docker-compose.metabase.yml
+++ b/backend/docker-compose.metabase.yml
@@ -10,7 +10,7 @@ services:
   # Metabase app
   #---------------------------------------------
   metabase:
-    image: metabase/metabase:v0.63.16.7
+    image: ghcr.io/gsa-tts/fac/metabase:latest
     container_name: metabase
     hostname: metabase
     volumes:
diff --git a/terraform/shared/modules/env/autoscaler.tf b/terraform/shared/modules/env/autoscaler.tf
index 321eb1e3d8..9dbc96cca4 100644
--- a/terraform/shared/modules/env/autoscaler.tf
+++ b/terraform/shared/modules/env/autoscaler.tf
@@ -15,7 +15,7 @@ resource "cloudfoundry_service_instance" "app_autoscaler" {
     scaling_rules = [
       {
         metric_type          = "memoryused"
-        threshold            = 3000 # 3GBs , scale down at 75% usage for instances with 4GB of memory
+        threshold            = 3000 # 3GBs , scale up at 75% usage for instances with 4GB of memory
         operator             = ">="
         adjustment           = "+1"
         breach_duration_secs = 60
diff --git a/terraform/shared/modules/metabase/metabase.tf b/terraform/shared/modules/metabase/metabase.tf
index 3d07c4c529..8a5647efd6 100644
--- a/terraform/shared/modules/metabase/metabase.tf
+++ b/terraform/shared/modules/metabase/metabase.tf
@@ -19,7 +19,7 @@ data "cloudfoundry_space" "app_space" {
 }
 
 data "docker_registry_image" "metabase" {
-  name = "ghcr.io/gsa-tts/fac/metabase:latest"
+  name = "ghcr.io/gsa-tts/fac/metabase:v0.64.3"
 }
 
 resource "cloudfoundry_route" "app_route" {