diff --git a/universalforwarder/Dockerfile b/universalforwarder/Dockerfile
index a0fd4fe..1791b42 100644
--- a/universalforwarder/Dockerfile
+++ b/universalforwarder/Dockerfile
@@ -9,6 +9,8 @@ ENV SPLUNK_HOME /opt/splunk
 ENV SPLUNK_GROUP splunk
 ENV SPLUNK_USER splunk
 ENV SPLUNK_BACKUP_DEFAULT_ETC /var/opt/splunk
+ENV SPLUNK_CERT_PATH /opt/splunk/etc/auth/self_signed
+
 ARG DEBIAN_FRONTEND=noninteractive
 
 # add splunk:splunk user
@@ -38,12 +40,15 @@ RUN apt-get update && apt-get install -y wget sudo \
     && mkdir -p /var/opt/splunk \
     && cp -R ${SPLUNK_HOME}/etc ${SPLUNK_BACKUP_DEFAULT_ETC} \
     && rm -fR ${SPLUNK_HOME}/etc \
+    && mkdir -p ${SPLUNK_CERT_PATH} \
     && chown -R ${SPLUNK_USER}:${SPLUNK_GROUP} ${SPLUNK_HOME} \
     && chown -R ${SPLUNK_USER}:${SPLUNK_GROUP} ${SPLUNK_BACKUP_DEFAULT_ETC} \
     && rm -rf /var/lib/apt/lists/*
 
 COPY entrypoint.sh /sbin/entrypoint.sh
 RUN chmod +x /sbin/entrypoint.sh
+COPY myCACertificate.pem /opt/splunk/etc/auth/self_signed/
+COPY myMainServerCertificate.pem /opt/splunk/etc/auth/self_signed/
 
 # Ports Splunk Daemon, Network Input, HTTP Event Collector
 EXPOSE 8089/tcp 1514 8088/tcp
diff --git a/universalforwarder/entrypoint.sh b/universalforwarder/entrypoint.sh
index f790a0d..cc5a26d 100644
--- a/universalforwarder/entrypoint.sh
+++ b/universalforwarder/entrypoint.sh
@@ -82,6 +82,9 @@ EOF
 
     # Setup deployment server
     # http://docs.splunk.com/Documentation/Splunk/latest/Updating/Configuredeploymentclients
+    if [[ -n ${SPLUNK_META} ]]; then
+      sudo -HEu ${SPLUNK_USER} echo ${SPLUNK_META} >> /opt/splunk/etc/system/local/inputs.conf 
+    fi
     if [[ -n ${SPLUNK_DEPLOYMENT_SERVER} ]]; then
       sudo -HEu ${SPLUNK_USER} sh -c "${SPLUNK_HOME}/bin/splunk set deploy-poll ${SPLUNK_DEPLOYMENT_SERVER} -auth admin:changeme"
       __restart_required=true
diff --git a/universalforwarder/myCACertificate.pem b/universalforwarder/myCACertificate.pem
new file mode 100644
index 0000000..ab6c57f
--- /dev/null
+++ b/universalforwarder/myCACertificate.pem
@@ -0,0 +1 @@
+#Root CA Cert
diff --git a/universalforwarder/myMainServerCertificate.pem b/universalforwarder/myMainServerCertificate.pem
new file mode 100644
index 0000000..bc98b67
--- /dev/null
+++ b/universalforwarder/myMainServerCertificate.pem
@@ -0,0 +1 @@
+#Client Certificate