diff --git a/.circleci/config.yml b/.circleci/config.yml
index a887de2..ac7bc11 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2
 jobs:
   machinery:
     docker:
-      - image: circleci/golang:1.15
+      - image: circleci/golang:1.18
     working_directory: /go/src/github.com/{{ORG_NAME}}/{{REPO_NAME}}
     steps:
       - checkout
@@ -23,7 +23,6 @@ jobs:
       - run: cd ui && yarn test --passWithNoTests
       - run: cd ui && yarn build
 
-
 workflows:
   version: 2
   build:
diff --git a/Dockerfile b/Dockerfile
index ff64553..80feeef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM kerberos/debian-opencv-ffmpeg:1.0.0 AS builder
+FROM kerberos/debian-opencv-ffmpeg:1.0.2309512445 AS builder
 MAINTAINER Kerberos.io
 
 ENV GOROOT=/usr/local/go
@@ -9,9 +9,9 @@ ENV GOSUMDB=off
 ##############################################################################
 # Copy all the relevant source code in the Docker image, so we can build this.
 
-RUN mkdir -p /go/src/github.com/kerberos-io/opensource
-COPY machinery /go/src/github.com/kerberos-io/opensource/machinery
-COPY web /go/src/github.com/kerberos-io/opensource/web
+RUN mkdir -p /go/src/github.com/kerberos-io/agent
+COPY machinery /go/src/github.com/kerberos-io/agent/machinery
+COPY web /go/src/github.com/kerberos-io/agent/web
 
 ########################
 # Download NPM and Yarns
@@ -24,24 +24,24 @@ RUN apt-get update && apt-get install -y curl && curl -sL https://deb.nodesource
 ###########
 # Build Web
 
-RUN cd /go/src/github.com/kerberos-io/opensource/web && \
+RUN cd /go/src/github.com/kerberos-io/agent/web && \
     npm install && yarn build
     # this will move the /build directory to ../machinery/www
 
 ##################
 # Build Machinery
 
-RUN cd /go/src/github.com/kerberos-io/opensource/machinery && \
+RUN cd /go/src/github.com/kerberos-io/agent/machinery && \
    go mod download && \
    go build main.go && \
-	 mkdir -p /opensource && \
-	 mv main /opensource && \
-	 mv www /opensource && \
-	 mkdir -p /opensource/data/cloud && \
-	 mkdir -p /opensource/data/snapshots && \
-	 mkdir -p /opensource/data/log && \
-	 mkdir -p /opensource/data/recordings && \
-	 mkdir -p /opensource/data/config && \
+	 mkdir -p /agent && \
+	 mv main /agent && \
+	 mv www /agent && \
+	 mkdir -p /agent/data/cloud && \
+	 mkdir -p /agent/data/snapshots && \
+	 mkdir -p /agent/data/log && \
+	 mkdir -p /agent/data/recordings && \
+	 mkdir -p /agent/data/config && \
 	 rm -rf /go/src/gitlab.com/
 
  ####################################
@@ -49,12 +49,12 @@ RUN cd /go/src/github.com/kerberos-io/opensource/machinery && \
  # Later, it will be copied as the / (root) of the output image.
 
  WORKDIR /dist
- RUN cp -r /opensource ./
+ RUN cp -r /agent ./
 
  ####################################
  # This will collect dependent libraries so they're later copied to the final image
 
- RUN ldd /opensource/main | tr -s '[:blank:]' '\n' | grep '^/' | \
+ RUN ldd /agent/main | tr -s '[:blank:]' '\n' | grep '^/' | \
      xargs -I % sh -c 'mkdir -p $(dirname ./%); cp % ./%;'
  RUN mkdir -p lib64 && cp /lib64/ld-linux-x86-64.so.2 lib64/
  RUN mkdir -p ./usr/lib
@@ -62,7 +62,7 @@ RUN cd /go/src/github.com/kerberos-io/opensource/machinery && \
  		 cp -r /usr/local/lib/libavformat* ./usr/lib && \
  		 cp -r /usr/local/lib/libswscale* ./usr/lib && \
 		 cp -r /usr/local/lib/libswresample* ./usr/lib
- RUN ldd /opensource/main
+ RUN ldd /agent/main
 
  FROM alpine:latest
 
@@ -86,6 +86,11 @@ RUN cd /go/src/github.com/kerberos-io/opensource/machinery && \
  ADD ./scripts/run.sh /run.sh
  RUN chmod 755 /run.sh && chmod +x /run.sh
 
+ # Install Bento4
+RUN cd && wget https://www.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-639.x86_64-unknown-linux.zip && \
+ unzip Bento4-SDK-1-6-0-639.x86_64-unknown-linux.zip && rm Bento4-SDK-1-6-0-639.x86_64-unknown-linux.zip && \
+ cp ~/Bento4-SDK-1-6-0-639.x86_64-unknown-linux/bin/mp4fragment /usr/bin/
+
  ######################################
  # By default the app runs on port 8080
 
diff --git a/machinery/go.mod b/machinery/go.mod
index 019d2a3..434a69b 100644
--- a/machinery/go.mod
+++ b/machinery/go.mod
@@ -1,6 +1,6 @@
 module github.com/kerberos-io/opensource/machinery
 
-go 1.15
+go 1.18
 
 require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751