diff --git a/pillars/roles/backup/init.sls b/pillars/roles/backup/init.sls
old mode 100644
new mode 100755
diff --git a/pillars/roles/backup/radarr.sls b/pillars/roles/backup/radarr.sls
old mode 100644
new mode 100755
diff --git a/pillars/roles/firewalld/nginx-proxy.sls b/pillars/roles/firewalld/nginx-proxy.sls
old mode 100644
new mode 100755
diff --git a/pillars/servers/env/server/debiangitlab.sls b/pillars/servers/env/server/debiangitlab.sls
new file mode 100644
index 0000000..2fdef9a
--- /dev/null
+++ b/pillars/servers/env/server/debiangitlab.sls
@@ -0,0 +1 @@
+env: prod
diff --git a/pillars/servers/maintainer/server/debiangitlab.sls b/pillars/servers/maintainer/server/debiangitlab.sls
new file mode 100644
index 0000000..c0b416d
--- /dev/null
+++ b/pillars/servers/maintainer/server/debiangitlab.sls
@@ -0,0 +1,3 @@
+maintainer:
+  - masaufuku
+
diff --git a/pillars/servers/roles/server/debiangitlab.sls b/pillars/servers/roles/server/debiangitlab.sls
new file mode 100644
index 0000000..07c13df
--- /dev/null
+++ b/pillars/servers/roles/server/debiangitlab.sls
@@ -0,0 +1,5 @@
+grains:
+  roles:
+    - server
+    - ssh
+    - saltminion
diff --git a/states/basepkgs/init.sls b/states/basepkgs/init.sls
index 8a76069..9fcf504 100644
--- a/states/basepkgs/init.sls
+++ b/states/basepkgs/init.sls
@@ -1,3 +1,4 @@
+{% if grains['os_family'] == 'Arch' %}
 nano:
   pkg.installed
 wget:
@@ -9,6 +10,21 @@ htop:
 git:
   pkg.installed
 
+{% elif grains['os_family'] == 'Debian' %}
+nano:
+  pkg.installed
+wget:
+  pkg.installed
+openssh-server:
+  pkg.installed
+htop:
+  pkg.installed
+git:
+  pkg.installed
+{% else %}
+blarg:
+  pkg.installed
+{% endif %}
 
 #note: bug in current version of saltstack breaks multi-package installs w/ yum. It'll be fixed in next version
 #https://github.com/saltstack/salt/issues/28356
diff --git a/states/roles/maintain/gitlab/init.sls b/states/roles/maintain/gitlab/init.sls
old mode 100644
new mode 100755
diff --git a/states/roles/maintain/saltminion/init.sls b/states/roles/maintain/saltminion/init.sls
index 271b252..c567889 100644
--- a/states/roles/maintain/saltminion/init.sls
+++ b/states/roles/maintain/saltminion/init.sls
@@ -29,14 +29,14 @@ salt-minion:
     - mode: 644
     - makedirs: true
 
-"/usr/lib/systemd/system/highstate.service":
+"/lib/systemd/system/highstate.service":
   file.managed:
     - source: salt://roles/maintain/saltminion/highstate.service
     - user: root
     - group: root
     - mode: 644
 
-"/usr/lib/systemd/system/highstate.timer":
+"/lib/systemd/system/highstate.timer":
   file.managed:
     - source: salt://roles/maintain/saltminion/highstate.timer
     - user: root
@@ -51,4 +51,4 @@ salt-minion:
   module.run:
     - name: service.systemctl_reload
     - onchanges:
-      - file: /usr/lib/systemd/system/*
+      - file: /lib/systemd/system/*
diff --git a/states/systems/core/mount/init.sls b/states/systems/core/mount/init.sls
old mode 100644
new mode 100755
diff --git a/states/top.sls b/states/top.sls
old mode 100644
new mode 100755
diff --git a/test b/test
old mode 100644
new mode 100755