diff --git a/Jenkinsfile b/Jenkinsfile
index 7cb40b6..d4fd0ee 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,14 +1,12 @@
-@Library('ml-library@enterprise-ml-release') _
+@Library('jenkins-library@opensource-release-multiarch') _
 dockerImagePipeline(
   script: this,
-  serviceCython: 'openvpn-server.alpine.amd64',
-  service: 'openvpn-client.alpine.amd64',
-  dockerfile: 'avesha_openvpn_client.dockerfile',
-  dockerFileCython: 'avesha_openvpn_server.dockerfile',
-  runUnitTests: false,
+  services: ['openvpn-server.alpine','openvpn-client.alpine'],
+  dockerfiles: ['avesha_openvpn_server.dockerfile','avesha_openvpn_client.dockerfile'],
   pushed: true,
-  testArguments: 'pytest --alluredir=/workspace/allure-report test/tools/', 
-  buildContext: '.',
-  buildArguments: [PLATFORM:"amd64"]
+  buildArgumentsList: [
+    [ENV: 'production', PLATFORM: 'linux/arm64,linux/amd64'],
+    [ENV: 'production', PLATFORM: 'linux/arm64,linux/amd64']
+]
   
 )
diff --git a/avesha_openvpn_client.dockerfile b/avesha_openvpn_client.dockerfile
index 07c4330..c22db69 100644
--- a/avesha_openvpn_client.dockerfile
+++ b/avesha_openvpn_client.dockerfile
@@ -33,8 +33,7 @@
 # TODO:  Add example of calling client docker with cmd line for all openvpn configuration parameters and utilizing files for crt/keys instead of an inline .ovpn file.
 # ####
 
-ARG PLATFORM
-FROM ${PLATFORM}/alpine:3.20.1
+FROM alpine:3.20.1
 
 RUN apk add --update --no-cache openvpn
 # Will need to add alpine GRE packages
diff --git a/avesha_openvpn_server.dockerfile b/avesha_openvpn_server.dockerfile
index 40bef76..0f50cdb 100644
--- a/avesha_openvpn_server.dockerfile
+++ b/avesha_openvpn_server.dockerfile
@@ -1,4 +1,4 @@
-FROM aveshatest/openvpn-server-base:sec-fix
+FROM aveshatest/openvpn-server-base:multi-arch-1.0.0
 # this base was built from: https://github.com/kylemanna/docker-openvpn
 
 # This docker file will be used for running the server in a container.