diff --git a/mininet/Chart.yaml b/mininet/Chart.yaml
index 511a649..1547112 100644
--- a/mininet/Chart.yaml
+++ b/mininet/Chart.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 apiVersion: v1
-appVersion: "1.0"
+appVersion: 1.0.0
 description: A Helm chart for Mininet
 name: mininet
-version: 0.5.2
+version: 1.0.0
diff --git a/mininet/templates/deployment.yaml b/mininet/templates/deployment.yaml
index 571e024..0f1807d 100644
--- a/mininet/templates/deployment.yaml
+++ b/mininet/templates/deployment.yaml
@@ -38,8 +38,8 @@
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.global.registry }}{{ .Values.images.mininet.repository }}:{{ tpl .Values.images.mininet.tag . }}"
+          imagePullPolicy: {{ .Values.images.mininet.pullPolicy }}
           args: ["/toposcripts/topo.py"]
           stdin: true
           tty: true
diff --git a/mininet/toposcripts/topo.py b/mininet/toposcripts/topo.py
index 121bb38..1ac31d6 100644
--- a/mininet/toposcripts/topo.py
+++ b/mininet/toposcripts/topo.py
@@ -31,12 +31,6 @@
 if __name__ == '__main__':
     setLogLevel( 'info' )
 
-    info( '*** Installing required software\n' )
-    print quietRun( 'apt-get update' )
-    print quietRun( 'apt-get -y install dnsmasq ethtool wget pimd bridge-utils' )
-    print quietRun( 'wget https://github.com/troglobit/mcjoin/releases/download/v2.4/mcjoin_2.4_amd64.deb' )
-    print quietRun( 'dpkg -i mcjoin_2.4_amd64.deb' )
-
     print quietRun( 'ovs-vsctl set Open_vSwitch . other_config:vlan-limit={{ .Values.vlanMatchDepth }}' )
     OVSSwitch13 = partial( OVSSwitch, protocols='OpenFlow13' )
     controllerIp = socket.gethostbyname( '{{ .Values.onosOpenflowSvc }}' )
diff --git a/mininet/values.yaml b/mininet/values.yaml
index 8b5e93a..1515347 100644
--- a/mininet/values.yaml
+++ b/mininet/values.yaml
@@ -21,10 +21,14 @@
 nameOverride: ""
 fullnameOverride: ""
 
-image:
-  repository: ciena/mininet
-  tag: ubuntu-bionic
-  pullPolicy: IfNotPresent
+images:
+  mininet:
+    repository: 'andybavier/mininet'
+    tag: '{{ .Chart.AppVersion }}'
+    pullPolicy: IfNotPresent
+
+global:
+  registry: ''
 
 resources: {}