diff --git a/public/v4/apps/mattermost-ee.yml b/public/v4/apps/mattermost-ee.yml
index 1aadcd9..5df42ca 100644
--- a/public/v4/apps/mattermost-ee.yml
+++ b/public/v4/apps/mattermost-ee.yml
@@ -1,7 +1,7 @@
 captainVersion: 4
 services:
     $$cap_appname-db:
-        image: mattermost/mattermost-prod-db:$$cap_mattermost_version
+        image: postgres:$$cap_postgres_version
         volumes:
             - $$cap_appname-db-data:/var/lib/postgresql/data
         restart: always
@@ -12,7 +12,7 @@ services:
         caproverExtra:
             notExposeAsWebApp: 'true'
     $$cap_appname:
-        image: mattermost/mattermost-prod-app:$$cap_mattermost_version
+        image: mattermost/mattermost-enterprise-edition:$$cap_mattermost_version
         depends_on:
             - $$cap_appname-db
         volumes:
@@ -28,14 +28,19 @@ services:
             MM_DBNAME: mattermost
             DB_HOST: srv-captain--$$cap_appname-db
             MM_SERVICESETTINGS_SITEURL: https://$$cap_appname.$$cap_root_domain
+            MM_SQLSETTINGS_DATASOURCE: postgres://mmuser:$$cap_pg_pass@srv-captain--$$cap_appname-db:5432/mattermost?sslmode=disable&connect_timeout=10
         caproverExtra:
-            containerHttpPort: '8000'
+            containerHttpPort: '8065'
 caproverOneClickApp:
     variables:
         - id: $$cap_mattermost_version
-          label: mattermost Docker Image tag
-          defaultValue: v5.31.1
+          label: mattermost Docker Image tag. Use 'latest' for updated images.
+          defaultValue: release-6.7
           description: Check out their Docker page for the valid tags https://hub.docker.com/r/mattermost/mattermost-prod-app/tags
+        - id: $$cap_postgres_version
+          label: postgres database Docker Image tag. Use 'latest' for updated images.
+          defaultValue: 14.3
+          description: Check out their Docker page for the valid tags https://hub.docker.com/_/postgres?tab=tags
         - id: $$cap_pg_pass
           label: Database Password
           description: Password must be at least 30 characters.  Please use a random string.
diff --git a/public/v4/apps/mattermost.yml b/public/v4/apps/mattermost.yml
deleted file mode 100644
index b1bb631..0000000
--- a/public/v4/apps/mattermost.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-captainVersion: 4
-services:
-    $$cap_appname-postgres:
-        image: postgres@$$cap_postgres_version
-        volumes:
-            - $$cap_appname-postgres-data:/var/lib/postgresql/data
-        restart: always
-        environment:
-            POSTGRES_USER: mattermost
-            POSTGRES_PASSWORD: $$cap_pg_pass
-            POSTGRES_DB: mattermost
-        caproverExtra:
-            notExposeAsWebApp: 'true'
-    $$cap_appname:
-        depends_on:
-            - $$cap_appname-postgres
-        volumes:
-            - $$cap_appname-data:/mattermost/data
-            - $$cap_appname-logs:/mattermost/logs
-            - $$cap_appname-config:/mattermost/config
-            - $$cap_appname-plugins:/mattermost/plugins
-            - $$cap_appname-clientplugins:/mattermost/client/plugins
-        restart: always
-        environment:
-            MM_SQLSETTINGS_DATASOURCE: postgres://mattermost:$$cap_pg_pass@srv-captain--$$cap_appname-postgres:5432/mattermost?sslmode=disable&connect_timeout=10
-            MM_SERVICESETTINGS_SITEURL: https://$$cap_appname.$$cap_root_domain
-            MM_LOGSETTINGS_ENABLEDIAGNOSTICS: 'false'
-            MM_SERVICESETTINGS_ENABLESECURITYFIXALERT: 'false'
-            MM_SQLSETTINGS_DRIVERNAME: postgres
-        caproverExtra:
-            containerHttpPort: '8065'
-            dockerfileLines:
-                - FROM mattermost/mattermost-team-edition@$$cap_mattermost_version
-                - RUN sed -i 's#api.segment.io#xx.example.com#gI' /mattermost/bin/mattermost
-                - RUN sed -i 's#securityupdatecheck.mattermost.com#xxxxxxxxxxxxxxxxxxxxxx.example.com#gI' /mattermost/bin/mattermost
-caproverOneClickApp:
-    variables:
-        - id: $$cap_postgres_version
-          label: Postgres Docker Image SHA Hash
-          defaultValue: sha256:110d3325db02daa6e1541fdd37725fcbecb7d51411229d922562f208c51d35cc
-          description: Check out their Docker page for the valid tags https://hub.docker.com/r/library/postgres/tags/ - default is 12.2 as of 2020-03-16
-        - id: $$cap_mattermost_version
-          label: Mattermost Docker Image SHA Hash
-          defaultValue: sha256:f8a4416d0a50a03ebacdbcd44790d5996230da3f48dbefd02307e4fd713567aa
-          description: Check out their Docker page for the valid tags https://hub.docker.com/r/mattermost/mattermost-team-edition/tags - default is current as of 2020-03-16
-        - id: $$cap_pg_pass
-          label: Postgres Password
-          description: Password must be at least 30 characters.  Please use a random string.
-          validRegex: /^[^\@]{30,}$/
-    instructions:
-        start: Open-source collaboration/chat server Mattermost Team Edition.
-        end: Mattermost is deployed and available as srv-captain--$$cap_appname:80.  Note that the application may take up to ten minutes to become available.  Following deployment you must verify MM_SERVICESETTINGS_SITEURL in the application's environment refers to your app's official public URL.
-    displayName: Mattermost
-    isOfficial: true
-    description: Mattermost Team Edition open source collaboration/chat software
-    documentation: https://github.com/mattermost/mattermost-docker
diff --git a/public/v4/logos/mattermost.png b/public/v4/logos/mattermost.png
deleted file mode 100644
index a68078b..0000000
Binary files a/public/v4/logos/mattermost.png and /dev/null differ