diff --git a/Dockerfile b/Dockerfile
index 581b8a5..4638009 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:6
+FROM centos:7
 
 MAINTAINER Zoltán Berkes <zoltan.berkes.1@gmail.com>
 
diff --git a/config b/config
index 2aae69e..31113ca 100644
--- a/config
+++ b/config
@@ -31,4 +31,4 @@ XILINX_ISE_VERSION="14.7"
 # The name of docker image to run.
 # If you create your own docker image based on xilinx-ise-centos6, then you
 # can give its name here.
-DOCKER_IMAGE="zberkes/xilinx-ise-centos6"
+DOCKER_IMAGE="xilinx-ise"
diff --git a/content/docker-entrypoint.sh b/content/docker-entrypoint.sh
index d564cba..6a84add 100755
--- a/content/docker-entrypoint.sh
+++ b/content/docker-entrypoint.sh
@@ -59,7 +59,7 @@ function apply_xilinx_settings {
 }
 
 if [[ -n $CREATE_USER ]]; then
-    groupadd --gid "${HOST_GID}" "${HOST_GROUP}"
+###    groupadd --gid "${HOST_GID}" "${HOST_GROUP}"
     useradd  --gid "${HOST_GID}" --uid "${HOST_UID}" --home-dir /home/workspace --no-create-home  "${HOST_USER}"
 fi
 
diff --git a/xilinx b/xilinx
index cfc587d..81833a4 100755
--- a/xilinx
+++ b/xilinx
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-SCRIPTDIR=$(dirname $(readlink -f "$0"))
+SCRIPTDIR=$(dirname $(stat -f "$0"))
 
 ##
 ## Process arguments
@@ -67,7 +67,7 @@ XILINX_ISE="XilinxISE"
 WORKSPACE="workspace"
 INSTALLER="install"
 XILINX_ISE_VERSION="14.7"
-DOCKER_IMAGE="zberkes/xilinx-ise-centos6"
+DOCKER_IMAGE="xilinx-ise"
 normalize_paths $SCRIPTDIR
 
 # process config files
@@ -98,6 +98,7 @@ if [[ -n $INSTALL_MODE ]]; then
     fi
     DOCKER_OPTIONS=("${DOCKER_OPTIONS[@]}" "-v" "${INSTALLER}:/media/install:ro")
     DOCKER_OPTIONS=("${DOCKER_OPTIONS[@]}" "-v" "${XILINX_ISE}:/opt/Xilinx")
+    DOCKER_OPTIONS=("${DOCKER_OPTIONS[@]}" "-v" "/private/tmp/:/private/tmp")
     CMD=("--install" "${CMD[@]}")
 else
     DOCKER_OPTIONS=("${DOCKER_OPTIONS[@]}" "-v" "${XILINX_ISE}:/opt/Xilinx:ro")
@@ -107,7 +108,7 @@ fi
 ## Run docker
 ##
 docker run "${DOCKER_OPTIONS[@]}" \
-       -e DISPLAY=$DISPLAY \
+       -e DISPLAY=host.docker.internal:0 \
        --net=host \
        -v $HOME/.Xauthority:/home/developer/.Xauthority:ro \
        -v "${WORKSPACE}":/home/workspace \