diff --git a/.github/uffizzi/k8s/manifests/backstage-deploy.yaml b/.github/uffizzi/k8s/manifests/backstage-deploy.yaml
index 9bf62e991a..2c1458cfea 100644
--- a/.github/uffizzi/k8s/manifests/backstage-deploy.yaml
+++ b/.github/uffizzi/k8s/manifests/backstage-deploy.yaml
@@ -35,3 +35,10 @@ spec:
               value: 'postgres.default.svc.cluster.local'
             - name: NODE_ENV
               value: production
+          resources:
+            limits:
+              cpu: 1000m
+              memory: 384Mi
+            requests:
+              cpu: 20m
+              memory: 160Mi
diff --git a/.github/uffizzi/k8s/manifests/pg-deploy.yaml b/.github/uffizzi/k8s/manifests/pg-deploy.yaml
index 354acd8e87..b842328978 100644
--- a/.github/uffizzi/k8s/manifests/pg-deploy.yaml
+++ b/.github/uffizzi/k8s/manifests/pg-deploy.yaml
@@ -19,11 +19,21 @@ spec:
           imagePullPolicy: 'IfNotPresent'
           ports:
             - containerPort: 5432
+          env:
+            - name: PGDATA
+              value: '/data/pgdata'
           envFrom:
             - secretRef:
                 name: postgres-secrets
+          resources:
+            limits:
+              cpu: 1000m
+              memory: 256Mi
+            requests:
+              cpu: 10m
+              memory: 96Mi
           volumeMounts:
-            - mountPath: /var/lib/postgresql
+            - mountPath: /data
               name: postgresdb
       volumes:
         - name: postgresdb
diff --git a/.github/workflows/uffizzi-build.yml b/.github/workflows/uffizzi-build.yml
index 4eaf2c2dc0..bfa6a0a373 100644
--- a/.github/workflows/uffizzi-build.yml
+++ b/.github/workflows/uffizzi-build.yml
@@ -56,7 +56,7 @@ jobs:
 
       - name: Generate UUID image name
         id: uuid
-        run: echo "UUID_TAG_APP=$(uuidgen)" >> $GITHUB_ENV
+        run: echo "UUID_TAG_APP=backstage-$(uuidgen --time)" >> $GITHUB_ENV
 
       - name: Docker metadata
         id: meta