diff --git a/roles/authelia/defaults/main.json b/roles/authelia/defaults/main.json
index f28370a..7de0a8c 100644
--- a/roles/authelia/defaults/main.json
+++ b/roles/authelia/defaults/main.json
@@ -9,21 +9,7 @@
 		"storage": {
 			"kind": "sqlite",
 			"data": {
-				"sqlite": {
-					"path": "/var/authelia/state.db"
-				},
-				"postgresql": {
-					"host": "localhost",
-					"port": 5432,
-					"username": "authelia_user",
-					"schema": "authelia"
-				},
-				"mariadb": {
-					"host": "localhost",
-					"port": 3306,
-					"username": "authelia_user",
-					"schema": "authelia"
-				}
+				"path": "/var/authelia/state.db"
 			}
 		},
 		"ntp_server": "time.cloudflare.com:123",
diff --git a/roles/nginx/tasks/main.json b/roles/nginx/tasks/main.json
index 1b7d843..e0e78cd 100644
--- a/roles/nginx/tasks/main.json
+++ b/roles/nginx/tasks/main.json
@@ -37,33 +37,38 @@
 		}
 	},
 	{
-		"name": "ufw | check",
-		"become": true,
-		"check_mode": true,
-		"community.general.ufw": {
-			"state": "enabled"
-		},
-		"register": "ufw_enable_check"
-	},
-	{
-		"name": "ufw | allow port 80",
-		"when": "not ufw_enable_check.changed",
-		"become": true,
-		"community.general.ufw": {
-			"rule": "allow",
-			"port": "80",
-			"proto": "tcp"
-		}
-	},
-	{
-		"name": "ufw | allow port 443",
-		"when": "not ufw_enable_check.changed",
-		"become": true,
-		"community.general.ufw": {
-			"rule": "allow",
-			"port": "443",
-			"proto": "tcp"
-		}
+		"name": "ufw",
+		"block": [
+			{
+				"name": "check",
+				"become": true,
+				"check_mode": true,
+				"community.general.ufw": {
+					"state": "enabled"
+				},
+				"register": "ufw_enable_check"
+			},
+			{
+				"name": "allow port 80",
+				"when": "not ufw_enable_check.changed",
+				"become": true,
+				"community.general.ufw": {
+					"rule": "allow",
+					"port": "80",
+					"proto": "tcp"
+				}
+			},
+			{
+				"name": "allow port 443",
+				"when": "not ufw_enable_check.changed",
+				"become": true,
+				"community.general.ufw": {
+					"rule": "allow",
+					"port": "443",
+					"proto": "tcp"
+				}
+			},
+		]
 	},
 	{
 		"name": "auto reload",