diff --git a/CI/al8_32.yml b/CI/al8_32.yml
index 0cff5d3142fecb7c970d1e1718b9c0d3fc499a64..93eee88d8772123e7de93236c350d549e7dab4d9 100644
--- a/CI/al8_32.yml
+++ b/CI/al8_32.yml
@@ -177,6 +177,7 @@ tests_al8_32:
   before_script:
     - umask 022
     - dnf -y install gcc-c++ file libepoxy.i686 libepoxy-devel.i686 tcsh
+    - export LEGACY=' -m32 '
   dependencies:
     - cernlib_al8_32
     - dstana_al8_32
diff --git a/CI/al9_32.yml b/CI/al9_32.yml
index 30e5024ec2fd6a61167573e101d3a582ad649ff7..855ef9de5fb3f72ccec0d35cab85bbbeacb29d8d 100644
--- a/CI/al9_32.yml
+++ b/CI/al9_32.yml
@@ -179,6 +179,7 @@ tests_al9_32:
   before_script:
     - umask 022
     - dnf -y install gcc-c++ file libepoxy.i686 libepoxy-devel.i686 tcsh
+    - export LEGACY=' -m32 '
   needs:
     - cernlib_al9_32
     - dstana_al9_32
diff --git a/make_openphigs b/make_openphigs
index a6b9b15424e22ead2fa5fc4e22a74a30189658fb..84d6634a071fbf3c43c63266272afc090048f95a 100755
--- a/make_openphigs
+++ b/make_openphigs
@@ -10,8 +10,8 @@ fi
 # setup environment
 . delphi.sh
 
-git clone https://:@gitlab.cern.ch:8443/delphi/openphigs.git
-cd openphigs
+git clone https://github.com/CERN/OpenPHIGS.git
+cd OpenPHIGS
 
 # check cmake version
 cmake_version=`cmake --version | head -1| cut -d. -f1| awk '{print $3}'`
@@ -44,8 +44,6 @@ else
     if (( $rc )); then exit $rc; fi
     mkdir -p $OPENPHIGS/lib
     mkdir -p $OPENPHIGS/bin
-    mkdir -p $OPENPHIGS/include/GL
-    mkdir -p $OPENPHIGS/include/VK
     mkdir -p $OPENPHIGS/include/phigs/private
     mkdir -p $OPENPHIGS/include/phigs/util
 # install libraries
@@ -54,8 +52,6 @@ else
 # install binaries
     cp -p build/tools/* $OPENPHIGS/bin
 # install headers
-    cp -p src/include/GL/*.h $OPENPHIGS/include/GL
-    cp -p src/include/Vk/*.h $OPENPHIGS/include/VK
     cp -p src/include/phigs/private/*.h $OPENPHIGS/include/phigs/private
     cp -p src/include/phigs/util/*.h $OPENPHIGS/include/phigs/util
     cp -p src/include/phigs/*.h $OPENPHIGS/include/phigs