diff --git a/container-scripts/c++.sh b/container-scripts/c++.sh
new file mode 100644
index 0000000..e25aff6
--- /dev/null
+++ b/container-scripts/c++.sh
@@ -0,0 +1 @@
+code-server --install-extension ms-vscode.cpptools-extension-pack
\ No newline at end of file
diff --git a/default/dockerfiles/c++/Dockerfile b/default/dockerfiles/c++/Dockerfile
new file mode 100644
index 0000000..0c23488
--- /dev/null
+++ b/default/dockerfiles/c++/Dockerfile
@@ -0,0 +1,20 @@
+FROM ubuntu
+
+RUN apt-get update \
+	&& apt-get install -y \
+	curl \
+	git \
+	sudo \
+	vim \
+	nano \
+	wget \
+	build-essential \
+	gdb \
+	&& rm -rf /var/lib/apt/lists/*
+
+ARG USER=coder
+RUN useradd --groups sudo --no-create-home --shell /bin/bash ${USER} \
+	&& echo "${USER} ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/${USER} \
+	&& chmod 0440 /etc/sudoers.d/${USER}
+USER ${USER}
+WORKDIR /home/${USER}
diff --git a/default/main.tf b/default/main.tf
index 8e6054a..60ac9ce 100644
--- a/default/main.tf
+++ b/default/main.tf
@@ -69,6 +69,11 @@ data "coder_parameter" "language" {
     value = "c"
   }
 
+  option {
+    name = "C++"
+    value = "c++"
+  }
+
   option {
     name = "Java"
     value = "java"