diff --git a/static-code-analysis/Dockerfile b/static-code-analysis/Dockerfile
index d3e185931617d1f964f3b221ba52f6fdcd31bd40..56874f73592ca4380069215f0881d7b4ecc884ec 100644
--- a/static-code-analysis/Dockerfile
+++ b/static-code-analysis/Dockerfile
@@ -1,33 +1,12 @@
-FROM openjdk:8-jre-alpine
+FROM sonarsource/sonar-scanner-cli:5
 
 ARG BUILD_DATE
 ARG VCS_REF
 ARG VERSION
 LABEL org.label-schema.build-date=$BUILD_DATE \
-      org.label-schema.name="Sonarqube Static Code Analyzer" \
-      org.label-schema.description="Docker image for static code analysis using a Sonarqube server" \
+      org.label-schema.name="SonarQube Static Code Analyzer" \
+      org.label-schema.description="Docker image for static code analysis using the SonarScanner CLI" \
       org.label-schema.vcs-ref=$VCS_REF \
       org.label-schema.vendor="University of Nebraska - Lincoln" \
-      org.label-schema.version="0.1.0" \
       org.label-schema.schema-version="1.0" \
-      maintainer="J.R. Barreras <barreras@unl.edu>"
-
-ENV SONAR_SCANNER_VERSION 4.6.0.2311
-
-WORKDIR /opt
-
-RUN apk add --no-cache curl sed bash nodejs-current nodejs-npm su-exec && \
-    mkdir -p /opt/src  && \
-    curl --insecure -o ./sonarscanner.zip -L  https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip  && \
-    unzip sonarscanner.zip  && \
-    rm sonarscanner.zip
-
-ENV SONAR_RUNNER_HOME=/opt/sonar-scanner-${SONAR_SCANNER_VERSION}
-ENV PATH $PATH:/opt/sonar-scanner-${SONAR_SCANNER_VERSION}/bin
-
-COPY entrypoint.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-CMD /bin/bash
-
+      maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
diff --git a/static-code-analysis/entrypoint.sh b/static-code-analysis/entrypoint.sh
deleted file mode 100644
index ae5005ecc0cce43e92b0deef7f09b317e36d55e1..0000000000000000000000000000000000000000
--- a/static-code-analysis/entrypoint.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Add local user
-# Either use the LOCAL_USER_ID if passed in at runtime or
-# fallback
-
-USER_ID=${LOCAL_USER_ID:-9001}
-
-su-exec user "$@"