diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5f2634e..8109b42 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -182,7 +182,7 @@ jobs:
           command: |
             export TAG=${CIRCLE_TAG:-latest}
             docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
-            docker run --rm --privileged hypriot/qemu-register
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             docker build --pull -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-arm64 -f Dockerfile.arm64 . 
             docker push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-arm64
 
diff --git a/.cirrus.yml b/.cirrus.yml
index 0a4d671..4425ef0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -9,5 +9,5 @@ linuxarmv6_docker_builder:
 
 linuxarm64_docker_builder:    
   script: |
-    docker run --rm --privileged hypriot/qemu-register
+    docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
     docker build -t $CIRRUS_REPO_FULL_NAME:cirrus-arm64 . -f Dockerfile.arm64
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8691357..8c2d6de 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -24,5 +24,5 @@ jobs:
 
     - name: Build an image from Dockerfile
       run: |
-        docker run --rm --privileged hypriot/qemu-register
+        docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
         docker build -t docker.io/${{ github.repository }}:${{ matrix.label }} -f ${{ matrix.dockerfile }} .
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83eb1a6..c992f5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ set(ALSA ON CACHE BOOL "use ALSA if available")
 set(STATICSTDCPP ON CACHE BOOL "use gcc static lib if available")
 set(LOG4CPP OFF CACHE BOOL "use log4cpp if available")
 set(LIVE555URL http://www.live555.com/liveMedia/public/live555-latest.tar.gz CACHE STRING "live555 url")
-set(LIVE555CFLAGS -DBSD=1 -DSOCKLEN_T=socklen_t -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -DALLOW_RTSP_SERVER_PORT_REUSE=1 CACHE STRING "live555 CFGLAGS")
+set(LIVE555CFLAGS -DBSD=1 -DSOCKLEN_T=socklen_t -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -DALLOW_RTSP_SERVER_PORT_REUSE=1 -DNO_STD_LIB=1 CACHE STRING "live555 CFGLAGS")
 
 if(NOT CMAKE_BUILD_TYPE)
      set (CMAKE_BUILD_TYPE "Release")