diff --git a/templates/Joomla/0/docker-compose.yml b/templates/Joomla/0/docker-compose.yml
index 8ea2daf..28b7f47 100644
--- a/templates/Joomla/0/docker-compose.yml
+++ b/templates/Joomla/0/docker-compose.yml
@@ -2,9 +2,7 @@ version: '2'
 
 services:
   joomla:
-    {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.1)"}}image: joomla:php7.1-apache{{- end}}
-    {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.2)"}}image: joomla:php7.2-apache{{- end}}
-    {{- if eq .Values.IMAGE_VERSION "Apache (PHP 7.3)"}}image: joomla:php7.3-apache{{- end}}
+    image: joomla:${IMAGE_VERSION}
     dns: # Using Cloudflare DNS
       - 1.1.1.1
       - 1.0.0.1
diff --git a/templates/Joomla/0/rancher-compose.yml b/templates/Joomla/0/rancher-compose.yml
index e2c0a4a..bf2b07a 100644
--- a/templates/Joomla/0/rancher-compose.yml
+++ b/templates/Joomla/0/rancher-compose.yml
@@ -48,9 +48,9 @@ catalog:
       required: true
       type: enum
       options:
-        - Apache (PHP 7.1)
-        - Apache (PHP 7.2)
-        - Apache (PHP 7.3)
+        - php7.1-apache
+        - php7.2-apache
+        - php7.3-apache
 
     - variable: "DATA_DIR"
       label: "Data Directory"