diff --git a/.gitmodules b/.gitmodules
index 080799d0..40360b5c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "site"]
 	path = site
 	url = https://github.com/FreifunkBremen/gluon-site-ffhb.git
+[submodule "roles/respondd"]
+	path = roles/respondd
+	url = https://github.com/freifunk-ansible/ansible-role-yanic.git
diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index af75f398..7c141ef0 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -6,3 +6,5 @@ site_domain:          'bremen.freifunk.net'
 site_vpn_prefix:      'vpn'
 icvpn_as:             65196
 fastd_peers_limit:    200
+
+freifunk_site_code: "{{ site_code }}"
diff --git a/group_vars/vpnservers.yml b/group_vars/vpnservers.yml
new file mode 100644
index 00000000..7b82baee
--- /dev/null
+++ b/group_vars/vpnservers.yml
@@ -0,0 +1,9 @@
+---
+yanic_respondd: true
+yanic_version: respondd
+
+yanic_respondd_batman: [bat-ffhb]
+yanic_respondd_listen_clientdev: [br-ffhb]
+yanic_respondd_listen_meshdev: 
+- vpn-ffhb
+- vpn-ffhb-legacy
diff --git a/roles/caddy/meta/main.yml b/roles/caddy/meta/main.yml
index 75398f40..c8c33861 100644
--- a/roles/caddy/meta/main.yml
+++ b/roles/caddy/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
-  - go
+  - golang
 galaxy_info:
   platforms:
     - name: Debian
diff --git a/roles/freifunkmanager/meta/main.yml b/roles/freifunkmanager/meta/main.yml
index 75398f40..c8c33861 100644
--- a/roles/freifunkmanager/meta/main.yml
+++ b/roles/freifunkmanager/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
-  - go
+  - golang
 galaxy_info:
   platforms:
     - name: Debian
diff --git a/roles/go/tasks/main.yml b/roles/go/tasks/main.yml
deleted file mode 100644
index 8242e75e..00000000
--- a/roles/go/tasks/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Download and install go
-  unarchive:
-    src: https://golang.org/dl/go1.17.1.linux-amd64.tar.gz
-    dest: /usr/local
-    copy: no
-
-- name: Configure go
-  template:
-    src: go.sh
-    dest: /etc/profile.d/go.sh
-    mode: 0644
-    owner: root
-    group: root
diff --git a/roles/golang/tasks/main.yml b/roles/golang/tasks/main.yml
new file mode 100644
index 00000000..1c6a6557
--- /dev/null
+++ b/roles/golang/tasks/main.yml
@@ -0,0 +1,18 @@
+---
+- name: Download and install go
+  unarchive:
+    src: https://dl.google.com/go/go1.12.4.linux-amd64.tar.gz
+    dest: /usr/local
+    copy: no
+
+- name: Install go dep
+  shell: /usr/local/go/bin/go get -u github.com/golang/dep/cmd/dep
+  args:
+    creates: /opt/go/bin/dep
+  environment:
+    GOPATH: /opt/go
+
+- name: Configure go
+  template:
+    src: go.sh
+    dest: /etc/profile.d/go.sh
diff --git a/roles/go/templates/go.sh b/roles/golang/templates/go.sh
similarity index 100%
rename from roles/go/templates/go.sh
rename to roles/golang/templates/go.sh
diff --git a/roles/respondd b/roles/respondd
new file mode 160000
index 00000000..b7daf2ca
--- /dev/null
+++ b/roles/respondd
@@ -0,0 +1 @@
+Subproject commit b7daf2cab1490dfa7d73e9c81037ae9a3e5fa545
diff --git a/roles/yanic/meta/main.yml b/roles/yanic/meta/main.yml
index 75398f40..c8c33861 100644
--- a/roles/yanic/meta/main.yml
+++ b/roles/yanic/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
-  - go
+  - golang
 galaxy_info:
   platforms:
     - name: Debian