diff --git a/public_server/README.md b/public_server/README.md
index 7ba002e8..fecc38ba 100644
--- a/public_server/README.md
+++ b/public_server/README.md
@@ -6,20 +6,21 @@ Public Server is a Friendica addon which implements automatic account & post exp
 
 This is a modified version of the testdrive addon, DO NOT ACTIVATE AT THE SAME TIME AS THE TESTDRIVE ADDON.
 
-    [public_server]
-	; When an account is created on the site, it is given a hard expiration date of
-    expiredays = 30
-    ; Set the default days for posts to expire here
-    expireposts = 30
-    ; Remove users who have never logged in after nologin days
-    nologin = 30
-    ; Remove users who last logged in over flagusers days ago
-    flagusers = 146
-    ; For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire
-    flagposts = 90
-    flagpostsexpire = 146
+    'public_server' => [
+        // When an account is created on the site, it is given a hard expiration date of. 0 to disable.
+        'expiredays' => 0,
+        // Set the default days for posts to expire here. 0 to disable.
+        'expireposts' => 0,
+        // Remove users who have never logged in after nologin days. 0 to disable.
+        'nologin' => 0,
+        // Remove users who last logged in over flagusers days ago. 0 to disable.
+        'flagusers' => 0,
+        // For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire. 0 to disable.
+        'flagposts' => 0,
+        'flagpostsexpire' => 0,
+    ],
 
-Set these in your config/addon.ini.php file. By default nothing is defined in case the addon is activated accidentally.
+Set these in your `config/addon.config.php` file. By default nothing is defined in case the addon is activated accidentally.
 They can be ommitted or set to 0 to disable each option.
 The default values are those used by friendica.eu, change these as desired.
 
diff --git a/public_server/config/public_server.config.php b/public_server/config/public_server.config.php
new file mode 100644
index 00000000..47ad4107
--- /dev/null
+++ b/public_server/config/public_server.config.php
@@ -0,0 +1,30 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'public_server' => [
+		// expiredays (Integer)
+		// When an account is created on the site, it is given a hard expiration date of. 0 to disable.
+		'expiredays' => 0,
+
+		// expireposts (Integer)
+		// Set the default days for posts to expire here. 0 to disable.
+		'expireposts' => 0,
+
+		// nologin (Integer)
+		// Remove users who have never logged in after nologin days. 0 to disable.
+		'nologin' => 0,
+
+		// flagusers (Integer)
+		// Remove users who last logged in over flagusers days ago. 0 to disable.
+		'flagusers' => 0,
+
+		// flagposts (Integer)
+		// flagpostsexpire (Integer)
+		// For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire. 0 to disable.
+		'flagposts' => 0,
+		'flagpostsexpire' => 0,
+	],
+];
diff --git a/public_server/config/public_server.ini.php b/public_server/config/public_server.ini.php
deleted file mode 100644
index 79b2ef46..00000000
--- a/public_server/config/public_server.ini.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[public_server]
-; expiredays (Integer)
-; When an account is created on the site, it is given a hard expiration date of
-expiredays =
-
-; expireposts (Integer)
-; Set the default days for posts to expire here
-expireposts =
-
-; nologin (Integer)
-; Remove users who have never logged in after nologin days
-nologin =
-
-; flagusers (Integer)
-; Remove users who last logged in over flagusers days ago
-flagusers =
-
-; flagposts (Integer)
-; flagpostsexpire (Integer)
-; For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire
-flagposts =
-flagpostsexpire =
-
-INI;
-//Keep this line
\ No newline at end of file
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 9b3aa405..ba7f2a64 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -37,7 +37,7 @@ function public_server_uninstall()
 
 function public_server_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/public_server.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/public_server.config.php');
 }
 
 function public_server_register_account($a, $b)