diff --git a/containers/Ubuntu_20.04/entrypoint.sh b/containers/Ubuntu_20.04/entrypoint.sh
index 110e3d6..a4f2c4c 100644
--- a/containers/Ubuntu_20.04/entrypoint.sh
+++ b/containers/Ubuntu_20.04/entrypoint.sh
@@ -4,6 +4,9 @@
 # (see https://stackoverflow.com/questions/4381618/exit-a-script-on-error)
 set -e
 
+if [[ "x$(uname -i)" == "xaarch64" ]] ; then
+    export LD_PRELOAD=/usr/local/lib/python3.8/dist-packages/scikit_learn.libs/libgomp-d22c30c5.so.1.0.0 
+fi
 
 if [[ "x$@" == "x" ]] ; then
 
diff --git a/test.sh b/test.sh
index a71dd90..f9bbde6 100755
--- a/test.sh
+++ b/test.sh
@@ -25,7 +25,7 @@ echo -e  "===============================\n"
 ENV_VARS="PYTHONWARNINGS=ignore TF_CPP_MIN_LOG_LEVEL=3 PYTHONUNBUFFERED=on EXTENDED_TESTING=False LOGLEVEL=$LOGLEVEL"
 
 if [ $# -eq 0 ]; then
-    docker run -v $PWD:/opt/Timeseria -eLD_PRELOAD=/usr/local/lib/python3.8/dist-packages/scikit_learn.libs/libgomp-d22c30c5.so.1.0.0 -it timeseria "cd /opt/Timeseria && $ENV_VARS KERAS_BACKEND=tensorflow python3 -m unittest"
+    docker run -v $PWD:/opt/Timeseria -it timeseria "cd /opt/Timeseria && $ENV_VARS KERAS_BACKEND=tensorflow python3 -m unittest"
 else
-    docker run -v $PWD:/opt/Timeseria -eLD_PRELOAD=/usr/local/lib/python3.8/dist-packages/scikit_learn.libs/libgomp-d22c30c5.so.1.0.0 -it timeseria "cd /opt/Timeseria && $ENV_VARS KERAS_BACKEND=tensorflow python3 -m unittest $@"
+    docker run -v $PWD:/opt/Timeseria -it timeseria "cd /opt/Timeseria && $ENV_VARS KERAS_BACKEND=tensorflow python3 -m unittest $@"
 fi