diff --git a/images/goland/Dockerfile.centos b/images/goland/Dockerfile.centos
index 4c6cf79..2e42e58 100644
--- a/images/goland/Dockerfile.centos
+++ b/images/goland/Dockerfile.centos
@@ -1,8 +1,18 @@
-FROM codercom/enterprise-multieditor:centos
+FROM codercom/enterprise-golang:centos
 
 # Run everything as root
 USER root
 
+# Packages required for multi-editor support
+RUN yum update -y && yum install -y \
+    openssl \
+    libXtst \
+    libXrender \
+    fontconfig \
+    libXi \
+    gtk3 \
+    libGL
+
 # Install goland.
 RUN mkdir -p /opt/goland
 RUN curl -L "https://download.jetbrains.com/product?code=GO&latest&distribution=linux" | tar -C /opt/goland --strip-components 1 -xzvf -
diff --git a/images/goland/Dockerfile.ubuntu b/images/goland/Dockerfile.ubuntu
index 362a19e..7c2c51d 100644
--- a/images/goland/Dockerfile.ubuntu
+++ b/images/goland/Dockerfile.ubuntu
@@ -1,8 +1,16 @@
-FROM codercom/enterprise-multieditor:ubuntu
+FROM codercom/enterprise-golang:ubuntu
 
 # Run everything as root
 USER root
 
+# Packages required for multi-editor support
+RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y \
+    libxtst6 \
+    libxrender1 \
+    libfontconfig1 \
+    libxi6 \
+    libgtk-3-0
+
 # Install goland.
 RUN mkdir -p /opt/goland
 RUN curl -L "https://download.jetbrains.com/product?code=GO&latest&distribution=linux" | tar -C /opt/goland --strip-components 1 -xzvf -
diff --git a/images/goland/README.md b/images/goland/README.md
index 4132ae1..36feef7 100644
--- a/images/goland/README.md
+++ b/images/goland/README.md
@@ -4,7 +4,7 @@
 
 ## Description
 
-Wraps [enterprise-multieditor](../multieditor/README.md) with GoLand
+Wraps [enterprise-golang](../golang/README.md) and includes [required multi-editor dependencies](https://enterprise.coder.com/docs/installing-an-ide-onto-your-image#required-packages) with GoLand
 installation.
 
 ## How To Use It