diff --git a/netoik-git.spec b/netoik-git.spec
index 0580251..11ea4c9 100644
--- a/netoik-git.spec
+++ b/netoik-git.spec
@@ -58,6 +58,8 @@ rm --recursive %{_tmppath}/gitea_images
 # Create postgres user and db
 if ! runuser --user=postgres -- psql --quiet --tuples-only --command='\du' | grep --quiet gitea; then
   runuser --user=postgres -- createuser gitea
+fi
+if ! runuser --user=postgres -- psql --quiet --tuples-only --command='\l' | grep --quiet gitea; then
   runuser --user=postgres -- createdb --owner=gitea gitea
 fi
 
@@ -103,8 +105,11 @@ if [ $1 == 0 ]; then
 	fi
 
 	# Remove gitea database if existing
+	if runuser --user=postgres -- psql --quiet --tuples-only --command='\l' | grep --quiet gitea; then
+  	runuser --user=postgres -- dropdb gitea
+	fi
 	if runuser --user=postgres -- psql --quiet --tuples-only --command='\du' | grep --quiet gitea; then
-  	runuser --user=postgres -- psql --command='DROP DATABASE gitea; DROP USER gitea;'
+		runuser --user=postgres -- dropuser gitea
 	fi
 
 	# Remove actrunner users if existing