diff --git a/docker/etherpad/Dockerfile b/docker/etherpad/Dockerfile
index f0dd71d5a8..111b1dc5c5 100644
--- a/docker/etherpad/Dockerfile
+++ b/docker/etherpad/Dockerfile
@@ -13,8 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM docker.io/etherpad/etherpad:1.8.0
+FROM docker.io/etherpad/etherpad:1.8.4
 
 LABEL maintainer="infra-root@openstack.org"
 
-RUN cd /opt/etherpad-lite && npm install ep_headings
+# Install the headings plugin and fix css on 1.8.4.
+# Newer etherpad shouldn't need the css fix.
+RUN cd /opt/etherpad-lite && npm install ep_headings \
+  && sed -i -e 's/padding: 6px 0 !important;/padding: 0 0 !important;/' \
+  /opt/etherpad-lite/src/static/css/iframe_editor.css
diff --git a/playbooks/roles/etherpad/templates/settings.json.j2 b/playbooks/roles/etherpad/templates/settings.json.j2
index 15d0154560..f645731278 100644
--- a/playbooks/roles/etherpad/templates/settings.json.j2
+++ b/playbooks/roles/etherpad/templates/settings.json.j2
@@ -29,6 +29,10 @@
                    "charset" : "utf8mb4",
                    "database": "etherpad-lite"
                  },
+
+  //force no skin as default has changed to colibris
+  "skinName": "no-skin",
+
   //the default text of a pad
   "defaultPadText" : "Welcome to OpenDev Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nOpenDev: https://opendev.org\nEtherpad on Github: https://github.com/ether/etherpad-lite\n",