diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6302949..fdc6e01 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -32,17 +32,6 @@ build-sc4s: &build-sc4s
           docker push \
             docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:sc4s-${SYSLOG}-<< pipeline.id >>
 
-    - run:
-        name: Docker Save
-        command: |
-          mkdir -p /tmp/workspace-${SYSLOG}
-          docker save $REGISTRY/$CI_IMAGE:$CIRCLE_SHA1 | gzip -c > /tmp/workspace-${SYSLOG}/oci_container.tar.gz
-
-    - persist_to_workspace:
-        root: /tmp
-        paths:
-          - workspace-${SYSLOG}
-
 build-splunk: &build-splunk
   steps:
     - checkout
@@ -64,8 +53,6 @@ build-splunk: &build-splunk
           docker push \
             docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:splunk-${SPLUNK}-<< pipeline.id >>
 
-
-
 test: &test
   steps:
     - checkout
@@ -95,6 +82,41 @@ test: &test
         path: test-results
 
 
+publish: &publish
+  steps:
+    - setup_remote_docker:
+        docker_layer_caching: true
+    - checkout
+    - docker/check:
+        registry: $REGISTRY
+        docker-username: GITHUB_USER
+        docker-password: GITHUB_TOKEN
+    - run: docker pull docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:sc4s-${SYSLOG}-<< pipeline.id >>
+    - run:
+        name: Docker Save
+        command: |
+          mkdir -p /tmp/workspace/
+          docker save docker.pkg.github.com/splunk/splunk-connect-for-syslog/stg-splunk-connect-for-syslog:sc4s-${SYSLOG}-<< pipeline.id >> | gzip -c > /tmp/workspace/oci_container.tar.gz
+    - run:
+        name: BYOE Config
+        command: |
+          tar rvf /tmp/workspace/baremetal.tar -C package/etc .
+          tar rvf /tmp/workspace/baremetal.tar -C package/sbin entrypoint.sh
+
+    - run: docker tag $REGISTRY/$CI_IMAGE:$CIRCLE_SHA1 $REGISTRY/$PUBLIC_IMAGE:${DOCKER_TAG}
+    - docker/push:
+        image: splunk/scs
+        tag: $DOCKER_TAG
+    - go/install
+    - run:
+        name: "Publish edge on GitHub"
+        command: |
+          PATH=$PATH:/usr/local/go/bin
+          go get -v -u github.com/tcnksm/ghr
+          $HOME/go/bin/ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${GHR_FLAGS} -delete ${DOCKER_TAG} /tmp/workspace/
+    - store_artifacts:
+        path: /tmp/workspace/
+
 orbs:
   docker: circleci/docker@0.5.20
   go: circleci/go@0.2.0
@@ -103,24 +125,6 @@ orbs:
   semver-orb: tv2norge/semver-orb@0.0.1
 
 jobs:
-  build-byoe:
-    docker:
-      - image: circleci/buildpack-deps:18.04
-    environment:
-      SYSLOG: '3.25.1'
-    steps:
-      - checkout
-      - run:
-          name: BYOE Config
-          command: |
-            mkdir -p /tmp/workspace-byoe/
-            tar rvf /tmp/workspace-byoe/baremetal.tar -C package/etc .
-            tar rvf /tmp/workspace-byoe/baremetal.tar -C package/sbin entrypoint.sh
-      - persist_to_workspace:
-          root: /tmp
-          paths:
-            - workspace-byoe
-
   build-tests:
     docker:
       - image: circleci/buildpack-deps:18.04
@@ -208,11 +212,24 @@ jobs:
       SPLUNK: '7-2'
     <<: *test
 
+  publish-edge:
+
+    docker:
+      - image: circleci/python:3.7
+    environment:
+      SYSLOG: '3.25.1'
+      SPLUNK: '7-2'
+      REGISTRY: docker.pkg.github.com
+      CI_IMAGE: splunk/splunk-connect-for-syslog/ci
+      REGISTRY_PUBLIC: docker.pkg.github.com
+      PUBLIC_IMAGE: splunk/splunk-connect-for-syslog/releases
+      DOCKER_TAG: edge
+      GHR_FLAGS: -prerelease
+    <<: *publish
 workflows:
   version: 2
   build_and_deploy:
     jobs:
-      - build-byoe
       - build-tests
       - build-sc4s-3-25-1
       - build-sc4s-master
@@ -239,3 +256,11 @@ workflows:
             - build-sc4s-3-25-1
             - build-splunk-7-2
             - build-tests
+      - publish-edge:
+          requires:
+            - test-sc4s-3-25-1-splunk-8-0
+#          filters:
+#            branches:
+#              only:
+#                - develop
+