diff --git a/voltha/templates/freeradius-config.yaml b/voltha/templates/freeradius-config.yaml
index a8aa079..63963d1 100644
--- a/voltha/templates/freeradius-config.yaml
+++ b/voltha/templates/freeradius-config.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 data:
   clients.conf: |
-    client 192.168.64.0/18 {
+    client 10.233.0.0/16 {
       secret = SECRET
     }
   users: |
diff --git a/voltha/templates/freeradius.yaml b/voltha/templates/freeradius.yaml
index 6436303..0f8b975 100644
--- a/voltha/templates/freeradius.yaml
+++ b/voltha/templates/freeradius.yaml
@@ -66,6 +66,12 @@
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: RADIUS_LISTEN_IP
+              value: "*"
+            - name: USERS_FILE
+              value: "/etc/raddb/users"
+            - name: RADIUS_CLIENTS
+              value: "SECRET@10.233.0.0/16"
           ports:
             - containerPort: 1812
               name: radauth-port
diff --git a/voltha/values.yaml b/voltha/values.yaml
index f148577..4cc250f 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -52,7 +52,7 @@
     createEtcdClusterCRD: true
 
 envoyForEtcdImage: 'voltha/voltha-envoy:latest'
-freeradiusImage: 'marcelmaatkamp/freeradius:latest'
+freeradiusImage: 'tpdock/freeradius:latest'
 grafanaImage: 'kamon/grafana_graphite:3.0'
 netconfImage: 'voltha/voltha-netconf:latest'
 ofagentImage: 'voltha/voltha-ofagent:latest'
@@ -60,7 +60,7 @@
 shovelImage: 'voltha/voltha-shovel:latest'
 vcliImage: 'voltha/voltha-cli:latest'
 vcoreImage: 'voltha/voltha-voltha:latest'
-  
+
 kafka:
   enabled: true
   persistence:
@@ -86,7 +86,7 @@
   #- "--grafana_url=http://admin:admin@grafana.$(NAMESPACE).svc.cluster.local:80/api"
   #- "--topic=voltha.kpis"
   #- "--consul=consul:8500"
-  
+
   #shovel_args:
   #- "/shovel/shovel/main.py"
   #- "--kafka={{ .Release.Name }}-kafka.default.svc.cluster.local"