diff --git a/puppet/bootstrap-server.sh b/puppet/bootstrap-server.sh
index 2f37424..74d287f 100755
--- a/puppet/bootstrap-server.sh
+++ b/puppet/bootstrap-server.sh
@@ -66,6 +66,7 @@ EOF
     fi
 
 cat >> /etc/puppet/manifests/node/${FQDN}.pp << EOF
+    \$puppet_storeconfigs = "none"
     include puppet::server::${SERVER}
     include puppet::manual
 
diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 8c2439b..70a6ee5 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -270,6 +270,14 @@ class puppet::server::common inherits puppet::client {
         case $puppet_dbadapter {
             "sqlite3": {
                 require ruby::sqlite3
+                file { "/srv/puppet/storeconfigs":
+                    ensure  => directory,
+                    mode    => "0750",
+                    owner   => $user,
+                    group   => $group,
+                    seltype => $seltype_readonly,
+                    require => File["/srv/puppet"],
+                }
             }
             "mysql": {
                 require ruby::mysql
@@ -343,16 +351,6 @@ class puppet::server::common inherits puppet::client {
         before => File["/srv/puppet/reports"],
     }
 
-    if $puppet_storeconfigs != "none" {
-        file { "/srv/puppet/storeconfigs":
-            ensure  => directory,
-            mode    => "0750",
-            owner   => $user,
-            group   => $group,
-            seltype => $seltype_readonly,
-            require => File["/srv/puppet"],
-        }
-    }
     file { [ "/srv/puppet/bucket",
              "/srv/puppet/reports",
              "/srv/puppet/rrd", ]: