diff --git a/public/svgs/zipline.png b/public/svgs/zipline.png
new file mode 100644
index 000000000..2b8f6972d
Binary files /dev/null and b/public/svgs/zipline.png differ
diff --git a/templates/compose/zipline.yaml b/templates/compose/zipline.yaml
index 0064c69c5..c5efc4058 100644
--- a/templates/compose/zipline.yaml
+++ b/templates/compose/zipline.yaml
@@ -1,17 +1,19 @@
 # documentation: https://github.com/diced/zipline
 # slogan: A ShareX/file upload server that is easy to use, packed with features, and with an easy setup!
 # tags: zipline,file-sharing,upload,sharing
+# logo: svgs/zipline.png
 # port: 3000
+
 services:
   zipline:
-    image: ghcr.io/diced/zipline
-    restart: unless-stopped
+    image: ghcr.io/diced/zipline:latest
     environment:
       - SERVICE_FQDN_ZIPLINE_3000
-      - CORE_RETURN_HTTPS=false
+      - CORE_RETURN_HTTPS=${CORE_RETURN_HTTPS:-false}
       - CORE_SECRET=${SERVICE_PASSWORD_64_ZIPLINE}
-      - CORE_DATABASE_URL=postgres://${SERVICE_USER_DATABASE}:${SERVICE_PASSWORD_64_DATABASE}@postgres/${POSTGRESQL_DATABASE:-zipline}
-      - CORE_LOGGER=true
+      - CORE_DATABASE_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres/${POSTGRES_DB:-zipline-db}
+      - CORE_LOGGER=${CORE_LOGGER:-true}
+      # Default credentials are "administrator" and "password"
     volumes:
       - zipline-uploads:/zipline/uploads
       - zipline-public:/zipline/public
@@ -24,18 +26,17 @@ services:
       interval: 5s
       timeout: 20s
       retries: 10
+
   postgres:
     image: postgres:16-alpine
     volumes:
-      - postgresql-data:/var/lib/postgresql/data
+      - zipline-postgres-data:/var/lib/postgresql/data
     environment:
-      - POSTGRES_USER=${SERVICE_USER_DATABASE}
-      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_64_DATABASE}
-      - POSTGRES_DB=${POSTGRESQL_DATABASE:-zipline}
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-zipline-db}
     healthcheck:
-      test:
-        - CMD-SHELL
-        - pg_isready -U $${SERVICE_USER_DATABASE} -d $${POSTGRESQL_DATABASE}
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s
       timeout: 20s
       retries: 10