diff --git a/app_server/src/main/java/com/supercars/Car.java b/app_server/src/main/java/com/supercars/Car.java
index 6b6682885..f49c900ce 100755
--- a/app_server/src/main/java/com/supercars/Car.java
+++ b/app_server/src/main/java/com/supercars/Car.java
@@ -31,7 +31,8 @@ public class Car {
     private float rating;
 
     public String getPhoto() {
-        return photo;
+        // do this as a hack, there is only 1 car photo per manufacturer DEMO-18
+        return Integer.toString(getManufacturerId());
     }
 
     public void setPhoto(String photo) {
diff --git a/app_server/src/main/java/com/supercars/dataloader/CarDataLoader.java b/app_server/src/main/java/com/supercars/dataloader/CarDataLoader.java
index d97271348..fe3e08999 100755
--- a/app_server/src/main/java/com/supercars/dataloader/CarDataLoader.java
+++ b/app_server/src/main/java/com/supercars/dataloader/CarDataLoader.java
@@ -109,6 +109,7 @@ public List<Car> getCarsByManufacturer(int manufacturerId) {
                 car.setDescription(resultSet.getString("DESCRIPTION"));
                 car.setPrice(resultSet.getInt("PRICE"));
                 car.setPhoto(resultSet.getString("PHOTO"));
+                car.setManufacturerId(manufacturerId);
                 cars.add(car);
             }
             resultSet.close();
diff --git a/app_server/src/main/webapp/angular/cars.html b/app_server/src/main/webapp/angular/cars.html
index 68def6b18..63218cbfb 100644
--- a/app_server/src/main/webapp/angular/cars.html
+++ b/app_server/src/main/webapp/angular/cars.html
@@ -7,7 +7,7 @@
 <table>
     <tr class="grey" ng-repeat="car in cars"> 
         <td> 
-            <p><img src="images/manufacturers/{{manufacturer.logo}} "></p>
+            <p><img width="150" height="100" src="images/cars/{{car.photo}}.jpg "></p>
         </td>
         <td>
             <p class="link" ng-click="carLink(car.carId)"/>{{car.model}}&nbsp;{{car.name}}&nbsp;{{car.summary}}</p>
diff --git a/app_server/src/main/webapp/angular/images/cars/0.gif b/app_server/src/main/webapp/angular/images/cars/0.gif
deleted file mode 100644
index 1c1c2d7c9..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/0.gif and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/0.jpg b/app_server/src/main/webapp/angular/images/cars/0.jpg
deleted file mode 100644
index 76beb24ca..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/0.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/1.jpg b/app_server/src/main/webapp/angular/images/cars/1.jpg
new file mode 100644
index 000000000..1a93d89e8
Binary files /dev/null and b/app_server/src/main/webapp/angular/images/cars/1.jpg differ
diff --git a/app_server/src/main/webapp/angular/images/cars/10.jpg b/app_server/src/main/webapp/angular/images/cars/10.jpg
deleted file mode 100644
index 97e5c0192..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/10.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/11.jpg b/app_server/src/main/webapp/angular/images/cars/11.jpg
deleted file mode 100644
index 8f3bf5a51..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/11.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/12.jpg b/app_server/src/main/webapp/angular/images/cars/12.jpg
deleted file mode 100644
index 457bf8cee..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/12.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/13.jpg b/app_server/src/main/webapp/angular/images/cars/13.jpg
deleted file mode 100644
index 8e33f7d40..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/13.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/14.jpg b/app_server/src/main/webapp/angular/images/cars/14.jpg
deleted file mode 100644
index 88f3ea101..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/14.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/15.jpg b/app_server/src/main/webapp/angular/images/cars/15.jpg
deleted file mode 100644
index 4f9e4007d..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/15.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/16.jpg b/app_server/src/main/webapp/angular/images/cars/16.jpg
deleted file mode 100644
index e52b758bb..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/16.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/17.jpg b/app_server/src/main/webapp/angular/images/cars/17.jpg
deleted file mode 100644
index 0df5e4f75..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/17.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/18.jpg b/app_server/src/main/webapp/angular/images/cars/18.jpg
deleted file mode 100644
index 2946824c2..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/18.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/19.jpg b/app_server/src/main/webapp/angular/images/cars/19.jpg
deleted file mode 100644
index f7c9c01e4..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/19.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/2.jpg b/app_server/src/main/webapp/angular/images/cars/2.jpg
index 4fcdf848d..989eff9d5 100644
Binary files a/app_server/src/main/webapp/angular/images/cars/2.jpg and b/app_server/src/main/webapp/angular/images/cars/2.jpg differ
diff --git a/app_server/src/main/webapp/angular/images/cars/20.jpg b/app_server/src/main/webapp/angular/images/cars/20.jpg
deleted file mode 100644
index 6a4157d77..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/20.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/21.jpg b/app_server/src/main/webapp/angular/images/cars/21.jpg
deleted file mode 100644
index 221085aca..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/21.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/22.jpg b/app_server/src/main/webapp/angular/images/cars/22.jpg
deleted file mode 100644
index 4f3645fa7..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/22.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/23.jpg b/app_server/src/main/webapp/angular/images/cars/23.jpg
deleted file mode 100644
index 137557891..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/23.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/24.jpg b/app_server/src/main/webapp/angular/images/cars/24.jpg
deleted file mode 100644
index 08ba84c79..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/24.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/25.jpg b/app_server/src/main/webapp/angular/images/cars/25.jpg
deleted file mode 100644
index 12b91b627..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/25.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/26.jpg b/app_server/src/main/webapp/angular/images/cars/26.jpg
deleted file mode 100644
index ed55912fa..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/26.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/27.jpg b/app_server/src/main/webapp/angular/images/cars/27.jpg
deleted file mode 100644
index 90f703652..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/27.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/28.jpg b/app_server/src/main/webapp/angular/images/cars/28.jpg
deleted file mode 100644
index 6e02572f4..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/28.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/29.jpg b/app_server/src/main/webapp/angular/images/cars/29.jpg
deleted file mode 100644
index 7d555c1dc..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/29.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/3.jpg b/app_server/src/main/webapp/angular/images/cars/3.jpg
index ee65809c6..9b4a5bd82 100644
Binary files a/app_server/src/main/webapp/angular/images/cars/3.jpg and b/app_server/src/main/webapp/angular/images/cars/3.jpg differ
diff --git a/app_server/src/main/webapp/angular/images/cars/30.jpg b/app_server/src/main/webapp/angular/images/cars/30.jpg
deleted file mode 100644
index 063f38055..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/30.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/31.jpg b/app_server/src/main/webapp/angular/images/cars/31.jpg
deleted file mode 100644
index 2c0efd5be..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/31.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/32.jpg b/app_server/src/main/webapp/angular/images/cars/32.jpg
deleted file mode 100644
index d6b2e6d0a..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/32.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/33.jpg b/app_server/src/main/webapp/angular/images/cars/33.jpg
deleted file mode 100644
index 402659adb..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/33.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/34.jpg b/app_server/src/main/webapp/angular/images/cars/34.jpg
deleted file mode 100644
index 1a817401f..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/34.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/35.jpg b/app_server/src/main/webapp/angular/images/cars/35.jpg
deleted file mode 100644
index 8bedd9616..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/35.jpg and /dev/null differ
diff --git a/app_server/src/main/webapp/angular/images/cars/4.jpg b/app_server/src/main/webapp/angular/images/cars/4.jpg
index 7cae6958c..1020001f3 100644
Binary files a/app_server/src/main/webapp/angular/images/cars/4.jpg and b/app_server/src/main/webapp/angular/images/cars/4.jpg differ
diff --git a/app_server/src/main/webapp/angular/images/cars/5.jpg b/app_server/src/main/webapp/angular/images/cars/5.jpg
index 91c2d7ad9..e51de08b4 100644
Binary files a/app_server/src/main/webapp/angular/images/cars/5.jpg and b/app_server/src/main/webapp/angular/images/cars/5.jpg differ
diff --git a/app_server/src/main/webapp/angular/images/cars/6.jpg b/app_server/src/main/webapp/angular/images/cars/6.jpg
index 54e2903e9..18573f65e 100644
Binary files a/app_server/src/main/webapp/angular/images/cars/6.jpg and b/app_server/src/main/webapp/angular/images/cars/6.jpg differ
diff --git a/app_server/src/main/webapp/angular/images/cars/7.jpg b/app_server/src/main/webapp/angular/images/cars/7.jpg
index 0b978b949..502c62560 100644
Binary files a/app_server/src/main/webapp/angular/images/cars/7.jpg and b/app_server/src/main/webapp/angular/images/cars/7.jpg differ
diff --git a/app_server/src/main/webapp/angular/images/cars/8.jpg b/app_server/src/main/webapp/angular/images/cars/8.jpg
index e0fdfc942..f307f70e8 100644
Binary files a/app_server/src/main/webapp/angular/images/cars/8.jpg and b/app_server/src/main/webapp/angular/images/cars/8.jpg differ
diff --git a/app_server/src/main/webapp/angular/images/cars/9.jpg b/app_server/src/main/webapp/angular/images/cars/9.jpg
deleted file mode 100644
index 4c742dd08..000000000
Binary files a/app_server/src/main/webapp/angular/images/cars/9.jpg and /dev/null differ
diff --git a/kubernetes/cars_app-staging.yaml b/kubernetes/cars_app-staging.yaml
index 78d2169d7..3df59e8a8 100644
--- a/kubernetes/cars_app-staging.yaml
+++ b/kubernetes/cars_app-staging.yaml
@@ -44,7 +44,7 @@ spec:
     spec:
       containers:
       - name: app-server
-        image:  tombatchelor/cars:2.4-leak
+        image:  tombatchelor/cars:2.5-leak
         imagePullPolicy: Always
         ports:
         - name: cars-app-port
diff --git a/kubernetes/cars_app.yaml b/kubernetes/cars_app.yaml
index 9b3e41ddf..38a74fa1e 100644
--- a/kubernetes/cars_app.yaml
+++ b/kubernetes/cars_app.yaml
@@ -45,7 +45,7 @@ spec:
     spec:
       containers:
       - name: app-server
-        image:  tombatchelor/cars:2.4-leak
+        image:  tombatchelor/cars:2.5-leak
         imagePullPolicy: Always
         ports:
         - name: cars-app-port
@@ -258,86 +258,6 @@ spec:
                   key: bucket.name
           restartPolicy: OnFailure
 ---
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: 2leak
-spec:
-  schedule: "0 0,4,8,12,16,20 * * *"
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          serviceAccountName: marshaller
-          containers:
-          - name: 2leak
-            imagePullPolicy: Always
-            image: tombatchelor/demo_marshaller:2.5
-            env:
-            - name: NEW_YAML
-              value: 2_leak
-          restartPolicy: OnFailure
----
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: 4leak
-spec:
-  schedule: "0 1,5,9,13,17,21 * * *"
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          serviceAccountName: marshaller
-          containers:
-          - name: 4leak
-            imagePullPolicy: Always
-            image: tombatchelor/demo_marshaller:2.5
-            env:
-            - name: NEW_YAML
-              value: 4_leak
-          restartPolicy: OnFailure
----
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: 4noleak
-spec:
-  schedule: "0 2,6,10,14,18,22 * * *"
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          serviceAccountName: marshaller
-          containers:
-          - name: 4noleak
-            imagePullPolicy: Always
-            image: tombatchelor/demo_marshaller:2.5
-            env:
-            - name: NEW_YAML
-              value: 4_no_leak
-          restartPolicy: OnFailure
----
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: 2noleak
-spec:
-  schedule: "0 3,7,11,15,19,23 * * *"
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          serviceAccountName: marshaller
-          containers:
-          - name: 2noleak
-            imagePullPolicy: Always
-            image: tombatchelor/demo_marshaller:2.5
-            env:
-            - name: NEW_YAML
-              value: 2_no_leak
-          restartPolicy: OnFailure
----
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/kubernetes/cron_jobs.yaml b/kubernetes/cron_jobs.yaml
new file mode 100644
index 000000000..edbca28d6
--- /dev/null
+++ b/kubernetes/cron_jobs.yaml
@@ -0,0 +1,79 @@
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: 2leak
+spec:
+  schedule: "0 0,4,8,12,16,20 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          serviceAccountName: marshaller
+          containers:
+          - name: 2leak
+            imagePullPolicy: Always
+            image: tombatchelor/demo_marshaller:2.5
+            env:
+            - name: NEW_YAML
+              value: 2_leak
+          restartPolicy: OnFailure
+---
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: 4leak
+spec:
+  schedule: "0 1,5,9,13,17,21 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          serviceAccountName: marshaller
+          containers:
+          - name: 4leak
+            imagePullPolicy: Always
+            image: tombatchelor/demo_marshaller:2.5
+            env:
+            - name: NEW_YAML
+              value: 4_leak
+          restartPolicy: OnFailure
+---
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: 4noleak
+spec:
+  schedule: "0 2,6,10,14,18,22 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          serviceAccountName: marshaller
+          containers:
+          - name: 4noleak
+            imagePullPolicy: Always
+            image: tombatchelor/demo_marshaller:2.5
+            env:
+            - name: NEW_YAML
+              value: 4_no_leak
+          restartPolicy: OnFailure
+---
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: 2noleak
+spec:
+  schedule: "0 3,7,11,15,19,23 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          serviceAccountName: marshaller
+          containers:
+          - name: 2noleak
+            imagePullPolicy: Always
+            image: tombatchelor/demo_marshaller:2.5
+            env:
+            - name: NEW_YAML
+              value: 2_no_leak
+          restartPolicy: OnFailure