diff --git a/packages/cosmic-swingset/Dockerfile b/packages/cosmic-swingset/Dockerfile
index eb268d57e10..401d445f80c 100644
--- a/packages/cosmic-swingset/Dockerfile
+++ b/packages/cosmic-swingset/Dockerfile
@@ -1,6 +1,6 @@
 # The Golang build container.
 # TODO This should be split out into the cosmos-connector.
-FROM golang:1.13-stretch
+FROM golang:1.14-stretch
 
 WORKDIR /usr/src/app
 COPY go.mod go.sum ./
diff --git a/packages/deployment/ansible/roles/init-controller/tasks/main.yml b/packages/deployment/ansible/roles/init-controller/tasks/main.yml
index a1c343f690c..7a1aed218e2 100644
--- a/packages/deployment/ansible/roles/init-controller/tasks/main.yml
+++ b/packages/deployment/ansible/roles/init-controller/tasks/main.yml
@@ -8,19 +8,28 @@
 - name: "Create provisioning mnemonic"
   delegate_to: localhost
   shell:
-    cmd: "ag-cosmos-helper keys mnemonic | tee provisioning-mnemonic.txt"
+    cmd: "ag-cosmos-helper keys mnemonic 2>&1 | tee provisioning-mnemonic.txt"
+    chdir: "{{ SETUP_HOME }}"
   register: mnemonic
 
+- name: "Delete {{ service }} ag-solo key"
+  become: yes
+  become_user: "{{ service }}"
+  shell:
+    cmd: "ag-cosmos-helper --home=/home/{{ service }}/.ag-pserver/ag-cosmos-helper-statedir --keyring-backend=test keys delete ag-solo --yes"
+    removes: "/home/{{ service }}/.ag-pserver/ag-cosmos-helper-statedir"
+  ignore_errors: yes
+
 - name: "Create {{ service }} ag-solo key"
   become: yes
   become_user: "{{ service }}"
   shell:
-    cmd: "ag-cosmos-helper --home=.{{ service }}/ag-cosmos-helper-statedir --keyring-backend=test keys add ag-solo"
-    stdin: "{{ mnemonic.stdout_lines }}"
+    cmd: "ag-cosmos-helper --home=/home/{{ service }}/.ag-pserver/ag-cosmos-helper-statedir --keyring-backend=test keys add --recover ag-solo"
+    stdin: "{{ mnemonic.stdout }}"
 
 - name: "Create ag-cosmos-helper-address"
   become: yes
   become_user: "{{ service }}"
   shell:
-    cmd: "ag-cosmos-helper --home=.{{ service }}/ag-cosmos-helper-statedir \
-      --keyring-backend=test keys show -a ag-solo > .{{ service }}/ag-cosmos-helper-address"
+    cmd: "ag-cosmos-helper --home=/home/{{ service }}/.ag-pserver/ag-cosmos-helper-statedir \
+      --keyring-backend=test keys show -a ag-solo > /home/{{ service }}/.ag-pserver/ag-cosmos-helper-address"
diff --git a/packages/deployment/ansible/roles/install-controller/tasks/main.yml b/packages/deployment/ansible/roles/install-controller/tasks/main.yml
index b9993731a20..b655506e5c3 100644
--- a/packages/deployment/ansible/roles/install-controller/tasks/main.yml
+++ b/packages/deployment/ansible/roles/install-controller/tasks/main.yml
@@ -34,13 +34,6 @@
     path: "/home/{{ service }}/.{{ service }}/wwwroot/current"
     src: "{{ CHAIN_NAME }}"
 
-- name: "set-gci-ingress for controller"
-  become_user: "{{ service }}"
-  become: true
-  shell:
-    cmd: "ag-solo set-gci-ingress --chainID={{ CHAIN_NAME }} {{ GCI }} {{ RPC_ADDRS }}"
-    chdir: "/home/{{ service }}/controller"
-
 - name: "Add {{ NETWORK_NAME }} keys"
   synchronize:
     src: "{{ SETUP_HOME }}/{{ NETWORK_NAME }}.{{ item }}"
diff --git a/packages/deployment/docker/ag-setup-cosmos b/packages/deployment/docker/ag-setup-cosmos
index 56efd39ad5f..76e024926a8 100755
--- a/packages/deployment/docker/ag-setup-cosmos
+++ b/packages/deployment/docker/ag-setup-cosmos
@@ -21,10 +21,6 @@ show-*)
   TTY=-i
   ;;
 esac
-if test -n "$CONTROLLER_VATS"; then
-  # Mount the specified controller vats directory.
-  FLAGS="$FLAGS --volume=`cd "$CONTROLLER_VATS" && pwd`:/usr/src/app/lib/ag-solo/vats"
-fi
 exec docker run --rm $TTY $FLAGS \
   --volume=ag-setup-cosmos-chains:/usr/src/app/chains \
   --volume=ag-cosmos-helper-state:/root/.ag-cosmos-helper \