diff --git a/hack/manifests/backstage/app-config.yaml b/hack/manifests/backstage/app-config.yaml
index e2d489ac4..e3a19bfc1 100644
--- a/hack/manifests/backstage/app-config.yaml
+++ b/hack/manifests/backstage/app-config.yaml
@@ -35,8 +35,8 @@ backend:
     connection:
       host: ${POSTGRES_SERVICE_HOST}
       port: 5432
-      user: admin
-      password: admin
+      user: parodos
+      password: parodos
   cache:
     store: memory
   # workingDirectory: /tmp # Use this to configure a working directory for the scaffolder, defaults to the OS temp-dir
@@ -59,7 +59,7 @@ proxy:
   #   target: 'https://example.com'
   #   changeOrigin: true
   '/parodos':
-    target: 'http://workflow-service.default.svc.cluster.local:8080/api/v1'
+    target: 'http://workflow-service:8080/api/v1'
     changeOrigin: true
     redirect: follow
     cache: 'no-cache'
@@ -69,7 +69,7 @@ proxy:
       Authorization: 'Basic dGVzdDp0ZXN0'
 
   '/parodos-notifications':
-    target: 'http://notification-service.default.svc.cluster.local:8080/api/v1'
+    target: 'http://notification-service:8080/api/v1'
     changeOrigin: true
     redirect: follow
     cache: 'no-cache'
diff --git a/hack/manifests/backstage/backstage.yaml b/hack/manifests/backstage/backstage.yaml
index 937a3e3b0..f1d532e34 100644
--- a/hack/manifests/backstage/backstage.yaml
+++ b/hack/manifests/backstage/backstage.yaml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: backstage
-  namespace: backstage
 spec:
   replicas: 1
   selector:
@@ -46,7 +45,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: backstage
-  namespace: backstage
 spec:
   selector:
     app: backstage
diff --git a/hack/manifests/backstage/kustomization.yaml b/hack/manifests/backstage/kustomization.yaml
index 1b44ff6d7..715d6d306 100644
--- a/hack/manifests/backstage/kustomization.yaml
+++ b/hack/manifests/backstage/kustomization.yaml
@@ -2,8 +2,6 @@ bases:
 - ../base
 
 resources:
-- namespace.yaml
-- postgres.yaml
 - postgres-parodos.yaml
 - backstage.yaml
 
@@ -12,20 +10,11 @@ patchesStrategicMerge:
 
 configMapGenerator:
 - name: app-config
-  namespace: backstage
   files:
   - app-config.yaml
 
 secretGenerator:
 - name: postgres-secrets
-  namespace: backstage
-  literals:
-  - POSTGRES_USER=admin
-  - POSTGRES_PASSWORD=admin
-  - PGDATA=/var/lib/postgresql/data/mydata
-
-- name: postgres-secrets-default
-  namespace: default
   literals:
   - POSTGRES_USER=parodos
   - POSTGRES_PASSWORD=parodos
diff --git a/hack/manifests/backstage/namespace.yaml b/hack/manifests/backstage/namespace.yaml
deleted file mode 100644
index 0514a5a30..000000000
--- a/hack/manifests/backstage/namespace.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: backstage
diff --git a/hack/manifests/backstage/parodos-patch.yaml b/hack/manifests/backstage/parodos-patch.yaml
index 357e0325d..1ed21c499 100644
--- a/hack/manifests/backstage/parodos-patch.yaml
+++ b/hack/manifests/backstage/parodos-patch.yaml
@@ -9,7 +9,7 @@ data:
   DATASOURCE_USERNAME: "parodos"
   DATASOURCE_PASSWORD: "parodos"
   SPRING_PROFILES_ACTIVE: "local"
-  NOTIFICATION_SERVER_ADDRESS: "notification-service.default.svc.cluster.local"
+  NOTIFICATION_SERVER_ADDRESS: "notification-service"
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/hack/manifests/backstage/postgres-parodos.yaml b/hack/manifests/backstage/postgres-parodos.yaml
index 46913f226..d46a45abf 100644
--- a/hack/manifests/backstage/postgres-parodos.yaml
+++ b/hack/manifests/backstage/postgres-parodos.yaml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: postgres-pvc
-  namespace: default
 spec:
   accessModes:
     - ReadWriteOnce
@@ -15,7 +14,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: postgres
-  namespace: default
 spec:
   replicas: 1
   selector:
@@ -37,7 +35,7 @@ spec:
               mountPath: /var/lib/postgresql/data
           envFrom:
             - secretRef:
-                name: postgres-secrets-default
+                name: postgres-secrets
           readinessProbe:
             exec:
               command: ["pg_isready"]
@@ -57,7 +55,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: postgres
-  namespace: default
 spec:
   selector:
     app: postgres
diff --git a/hack/manifests/backstage/postgres.yaml b/hack/manifests/backstage/postgres.yaml
deleted file mode 100644
index 87185a7dc..000000000
--- a/hack/manifests/backstage/postgres.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: postgres-pvc
-  namespace: backstage
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 8Gi
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: postgres
-  namespace: backstage
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: postgres
-  template:
-    metadata:
-      labels:
-        app: postgres
-    spec:
-      containers:
-        - name: postgres
-          image: postgres:13.2-alpine
-          imagePullPolicy: 'IfNotPresent'
-          ports:
-            - containerPort: 5432
-          volumeMounts:
-            - name: storage
-              mountPath: /var/lib/postgresql/data
-          envFrom:
-            - secretRef:
-                name: postgres-secrets
-          readinessProbe:
-            exec:
-              command: ["pg_isready"]
-            initialDelaySeconds: 15
-            timeoutSeconds: 2
-          livenessProbe:
-            exec:
-              command: ["pg_isready"]
-            initialDelaySeconds: 15
-            timeoutSeconds: 2
-      volumes:
-      - name: storage
-        persistentVolumeClaim:
-          claimName: postgres-pvc
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: postgres
-  namespace: backstage
-spec:
-  selector:
-    app: postgres
-  ports:
-    - port: 5432
diff --git a/hack/manifests/base/config.yaml b/hack/manifests/base/config.yaml
index badf534e5..baafb17b9 100644
--- a/hack/manifests/base/config.yaml
+++ b/hack/manifests/base/config.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: workflow-service-config
-  namespace: default
 data:
   SPRING_PROFILES_ACTIVE: "local"
 ---
@@ -10,6 +9,5 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: notification-service-config
-  namespace: default
 data:
   SPRING_PROFILES_ACTIVE: "local"
diff --git a/hack/manifests/base/deployment.yaml b/hack/manifests/base/deployment.yaml
index 3e6ef3f79..0d306e536 100644
--- a/hack/manifests/base/deployment.yaml
+++ b/hack/manifests/base/deployment.yaml
@@ -60,5 +60,5 @@ spec:
           httpGet:
             path: /actuator/health
             port: 8080
-          initialDelaySeconds: 25
+          initialDelaySeconds: 40
           timeoutSeconds: 4