diff --git a/pillars/envs.sls b/pillars/envs.sls
new file mode 100644
index 0000000..b43e23f
--- /dev/null
+++ b/pillars/envs.sls
@@ -0,0 +1,9 @@
+{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
+envs:
+{%- if envs is not none -%}
+  {%- for env in envs %}
+  - {{env}}
+  {%- endfor -%}
+{%- else -%}
+  - prod
+{%- endif -%}
diff --git a/pillars/top.sls b/pillars/top.sls
index 53aa3c7..4283629 100644
--- a/pillars/top.sls
+++ b/pillars/top.sls
@@ -4,4 +4,5 @@
   '*':
     - roles
     - servers
+    - envs
 {%- endfor %}
diff --git a/states/roles/maintain/nextcloud/nextcloud-config.php b/states/roles/maintain/nextcloud/nextcloud-config.php
index ae90e92..3c35b04 100644
--- a/states/roles/maintain/nextcloud/nextcloud-config.php
+++ b/states/roles/maintain/nextcloud/nextcloud-config.php
@@ -6,6 +6,7 @@ $CONFIG = array (
     1 => 'cloud.actcur.com'
   ),
   'overwrite.cli.url' => 'https://cloud.actcur.com/',
+  'overwriteprotocol' => 'https',
   'htaccess.RewriteBase' => '/',
   'datadirectory' => '/mnt/nextcloud/data',
   'logfile' => '/var/log/nextcloud/nextcloud.log',
diff --git a/states/top.sls b/states/top.sls
index d5df904..faad60e 100644
--- a/states/top.sls
+++ b/states/top.sls
@@ -1,8 +1,6 @@
 
 {%- set states = salt['cp.list_states'](saltenv) -%}
-{%- set envs=salt.cmd.shell('git ls-remote https://git.actcur.com/actcur/salt.git | grep -o -P "(?<=refs/heads/).*" | grep -Pv "(^temp$)|(^history$)"').split('\n') -%}
-{%- set envs=salt.cmd.shell('ls /srv/salt/').split('\n') -%}
-{% for env in envs %}
+{% for env in pillar['envs'] %}
 {{ env }}:
   'os_family:RedHat':
     - match: grain_pcre