diff --git a/cloud.yml b/cloud.yml
index 9856039..5fda253 100644
--- a/cloud.yml
+++ b/cloud.yml
@@ -8,14 +8,17 @@
     - name: Deploy traefik website
       import_tasks: tasks/traefik.yml
 
-    # - name: Deploy Vaultwarden
-    #   import_tasks: tasks/vaultwarden.yml
-    #   tags: vaultwarden_install
+    - name: Deploy postgres website
+      import_tasks: tasks/postgres.yml
 
-    # - name: Deploy gitea
-    #   import_tasks: tasks/gitea.yml
-    #   tags: gitea_install
+    - name: Deploy Vaultwarden
+      import_tasks: tasks/vaultwarden.yml
+      tags: vaultwarden_install
 
-    # - name: Gotify
-    #   import_tasks: tasks/gotify.yml
-    #   tags: gotify_install
\ No newline at end of file
+    - name: Deploy gitea
+      import_tasks: tasks/gitea.yml
+      tags: gitea_install
+
+    - name: Gotify
+      import_tasks: tasks/gotify.yml
+      tags: gotify_install
\ No newline at end of file
diff --git a/tasks/mssql.yml b/tasks/OLDmssql.yml
similarity index 100%
rename from tasks/mssql.yml
rename to tasks/OLDmssql.yml
diff --git a/tasks/osticket.yml b/tasks/OLDosticket.yml
similarity index 100%
rename from tasks/osticket.yml
rename to tasks/OLDosticket.yml
diff --git a/tasks/postgres.yml b/tasks/postgres.yml
index a44e739..4dd01a7 100644
--- a/tasks/postgres.yml
+++ b/tasks/postgres.yml
@@ -4,13 +4,20 @@
     path: "{{ item }}"
     state: directory
   with_items:
-    - "/mnt/nfs/docker/postgres"
-    - "/mnt/nfs/docker/postgres/config"
+    - "/data/postgres"
+    - "/data/postgres/data"
+
+- name: Pull docker image
+  community.docker.docker_image:
+    image: postgres
+    tag: 17.0-alpine
+    source: pull
+  register: docker_image
 
 - name: Create the postgres container
   docker_container:
     name: postgres
-    image: postgres:16-alpine
+    image: "{{ docker_image.image.RepoTags[0] }}"
     restart_policy: unless-stopped
     recreate: true
     ports:
@@ -18,5 +25,7 @@
     env:
       POSTGRES_PASSWORD: "{{POSTGRES_PASSWORD}}"
     volumes:
-      - /mnt/nfs/docker/postgres/db-data:/var/lib/postgresql/data
+      - /data/postgres/data:/var/lib/postgresql/data
+  when: docker_image.changed
+  register: container_postgres