diff --git a/templates/postgres.15.template.yml b/templates/postgres.15.template.yml
index 5bc06f20b..cf4d20c23 100644
--- a/templates/postgres.15.template.yml
+++ b/templates/postgres.15.template.yml
@@ -132,8 +132,10 @@ run:
            exit 1
          fi
 
-         mv /shared/postgres_data /shared/postgres_data_old
-         mv /shared/postgres_data_new /shared/postgres_data
+         mkdir /shared/postgres_data_old
+         mv /shared/postgres_data/* /shared/postgres_data_old
+         mv /shared/postgres_data_new/* /shared/postgres_data
+         rmdir /shared/postgres_data_new
 
          echo -------------------------------------------------------------------------------------
          echo UPGRADE OF POSTGRES COMPLETE
diff --git a/templates/postgres.template.yml b/templates/postgres.template.yml
index c24bfe6cc..03813c479 100644
--- a/templates/postgres.template.yml
+++ b/templates/postgres.template.yml
@@ -139,8 +139,10 @@ run:
            exit 1
          fi
 
-         mv /shared/postgres_data /shared/postgres_data_old
-         mv /shared/postgres_data_new /shared/postgres_data
+         mkdir /shared/postgres_data_old
+         mv /shared/postgres_data/* /shared/postgres_data_old
+         mv /shared/postgres_data_new/* /shared/postgres_data
+         rmdir /shared/postgres_data_new
 
          echo -------------------------------------------------------------------------------------
          echo UPGRADE OF POSTGRES COMPLETE