diff --git a/examples-of-custom-resources/advanced-routing/cafe.yaml b/examples-of-custom-resources/advanced-routing/cafe.yaml
index e844153e6b..3daaf2744f 100644
--- a/examples-of-custom-resources/advanced-routing/cafe.yaml
+++ b/examples-of-custom-resources/advanced-routing/cafe.yaml
@@ -14,9 +14,9 @@ spec:
     spec:
       containers:
       - name: coffee-v1
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -25,7 +25,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
@@ -47,9 +47,9 @@ spec:
     spec:
       containers:
       - name: coffee-v2
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -58,7 +58,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
@@ -80,9 +80,9 @@ spec:
     spec:
       containers:
       - name: tea-post 
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -91,7 +91,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
@@ -113,9 +113,9 @@ spec:
     spec:
       containers:
       - name: tea 
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -124,7 +124,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
diff --git a/examples-of-custom-resources/basic-configuration/cafe.yaml b/examples-of-custom-resources/basic-configuration/cafe.yaml
index f37772a5e3..fc14eae89f 100644
--- a/examples-of-custom-resources/basic-configuration/cafe.yaml
+++ b/examples-of-custom-resources/basic-configuration/cafe.yaml
@@ -14,9 +14,9 @@ spec:
     spec:
       containers:
       - name: coffee
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -25,7 +25,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
@@ -47,9 +47,9 @@ spec:
     spec:
       containers:
       - name: tea 
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -58,7 +58,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
diff --git a/examples-of-custom-resources/cross-namespace-configuration/coffee.yaml b/examples-of-custom-resources/cross-namespace-configuration/coffee.yaml
index 135a61558a..7d27a8983c 100644
--- a/examples-of-custom-resources/cross-namespace-configuration/coffee.yaml
+++ b/examples-of-custom-resources/cross-namespace-configuration/coffee.yaml
@@ -15,9 +15,9 @@ spec:
     spec:
       containers:
       - name: coffee
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -27,7 +27,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
diff --git a/examples-of-custom-resources/cross-namespace-configuration/tea.yaml b/examples-of-custom-resources/cross-namespace-configuration/tea.yaml
index 3f5643a639..8d19efc58c 100644
--- a/examples-of-custom-resources/cross-namespace-configuration/tea.yaml
+++ b/examples-of-custom-resources/cross-namespace-configuration/tea.yaml
@@ -15,9 +15,9 @@ spec:
     spec:
       containers:
       - name: tea 
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -27,7 +27,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
diff --git a/examples-of-custom-resources/traffic-splitting/cafe.yaml b/examples-of-custom-resources/traffic-splitting/cafe.yaml
index 55933667d2..a4be8b1194 100644
--- a/examples-of-custom-resources/traffic-splitting/cafe.yaml
+++ b/examples-of-custom-resources/traffic-splitting/cafe.yaml
@@ -14,9 +14,9 @@ spec:
     spec:
       containers:
       - name: coffee-v1
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -25,7 +25,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
@@ -47,9 +47,9 @@ spec:
     spec:
       containers:
       - name: coffee-v2
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -58,7 +58,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
diff --git a/examples/complete-example/cafe.yaml b/examples/complete-example/cafe.yaml
index 2958e4f11d..67803bc138 100644
--- a/examples/complete-example/cafe.yaml
+++ b/examples/complete-example/cafe.yaml
@@ -14,9 +14,9 @@ spec:
     spec:
       containers:
       - name: coffee
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -25,7 +25,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
@@ -47,9 +47,9 @@ spec:
     spec:
       containers:
       - name: tea 
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -59,7 +59,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
diff --git a/examples/health-checks/README.md b/examples/health-checks/README.md
index be4cc2e186..ac28300d21 100644
--- a/examples/health-checks/README.md
+++ b/examples/health-checks/README.md
@@ -59,12 +59,12 @@ spec:
     spec:
       containers:
       - name: tea
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
         readinessProbe:
           httpGet:
-            port: 80
+            port: 8080
             path: /healthz/tea
             httpHeaders:
             - name: header1
diff --git a/examples/mergeable-ingress-types/cafe.yaml b/examples/mergeable-ingress-types/cafe.yaml
index 2958e4f11d..67803bc138 100644
--- a/examples/mergeable-ingress-types/cafe.yaml
+++ b/examples/mergeable-ingress-types/cafe.yaml
@@ -14,9 +14,9 @@ spec:
     spec:
       containers:
       - name: coffee
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -25,7 +25,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
@@ -47,9 +47,9 @@ spec:
     spec:
       containers:
       - name: tea 
-        image: nginxdemos/hello:plain-text
+        image: nginxdemos/nginx-hello:plain-text
         ports:
-        - containerPort: 80
+        - containerPort: 8080
 ---
 apiVersion: v1
 kind: Service
@@ -59,7 +59,7 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     protocol: TCP
     name: http
   selector:
diff --git a/tests/data/common/backend1-svc.yaml b/tests/data/common/backend1-svc.yaml
index 3e58d108c1..6474571121 100644
--- a/tests/data/common/backend1-svc.yaml
+++ b/tests/data/common/backend1-svc.yaml
@@ -9,4 +9,4 @@ spec:
     protocol: TCP
     name: http
   selector:
-    app: backend1
\ No newline at end of file
+    app: backend1