diff --git a/smartgears/smartgears-container/defaults/main.yml b/smartgears/smartgears-container/defaults/main.yml
deleted file mode 100644
index 1b9265a5..00000000
--- a/smartgears/smartgears-container/defaults/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-repo: "gcube-staging"
-smartgears_version: "2.0.0-4.2.1-133740"
-image_name: "smartgears_whn"
-image_tag: "{{ smartgears_version }}"
-#image_tag: "latest"
-
-
-infrastructure: "d4s"
-hostname: "{{ ansible_hostname }}"
-token: "24edab1c-6ff6-4c61-8f51-b52d4f5f4611-98187548"
-container_mode: "offline"
diff --git a/smartgears/smartgears-container/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar b/smartgears/smartgears-container/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar
deleted file mode 100644
index 15c2afdd..00000000
Binary files a/smartgears/smartgears-container/files/common-scope-maps-1.0.4-4.2.0-128425-patched.jar and /dev/null differ
diff --git a/smartgears/smartgears-container/meta/main.yml b/smartgears/smartgears-container/meta/main.yml
deleted file mode 100644
index 8f1a32cb..00000000
--- a/smartgears/smartgears-container/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies:
-# - role: java-17
- - role: docker
diff --git a/smartgears/smartgears-container/tasks/main.yml b/smartgears/smartgears-container/tasks/main.yml
deleted file mode 100644
index 224971c8..00000000
--- a/smartgears/smartgears-container/tasks/main.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-- name: ensure that the unarchive utils tar relies upon for file extraction are available (CentOS/RHEL)
-  yum: name={{ item }} state=latest
-  with_items:
-  - bzip2
-  - unzip
-  when: ansible_os_family == "RedHat"
-
-- name: ensure that the unarchive utils tar relies upon for file extraction are available (Debian/Ubuntu)
-  apt: name={{ item }} state=latest
-  with_items:
-  - bzip2
-  - unzip
-  when: ansible_os_family == "Debian"
-
-- name: create temporary build directory
-  shell: mktemp -d
-  register: tempdir
-
-- name: copy the Dockerfile
-  template: src=Dockerfile dest="{{ tempdir.stdout }}/"
-
-- name: copy the authorization config file
-  template: src=d4s.authorization dest="{{ tempdir.stdout }}/" mode=0644
- 
-- name: Build the docker image
-  docker_image:
-    path: "{{ tempdir.stdout }}"
-    name: "{{ image_name }}"
-    tag: "{{ image_tag }}"
-
-- name: remove the temporary build directory
-  file: path="{{ tempdir.stdout }}" state=absent
diff --git a/smartgears/smartgears-container/templates/Dockerfile b/smartgears/smartgears-container/templates/Dockerfile
deleted file mode 100644
index cc0d8638..00000000
--- a/smartgears/smartgears-container/templates/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-from openjdk:7
-
-ENV GHN_HOME=/SmartGears-Bundle/
-ENV BUNDLE_HOME=$GHN_HOME
-ENV CATALINA_HOME=$GHN_HOME/tomcat/
-ENV CATALINA_OPTS="-Xmx2000m -Xms2000m -XX:MaxPermSize=512M" 
-ENV CATALINA_PID=$CATALINA_HOME/pid.txt
-
-RUN  wget http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/distribution/smartgears-distribution-bundle/{{ smartgears_version }}/smartgears-distribution-bundle-{{ smartgears_version }}.tar.gz 
-RUN tar xzvf smartgears-distribution-bundle-{{ smartgears_version }}.tar.gz
-RUN rm smartgears-distribution-bundle-{{ smartgears_version }}.tar.gz
-WORKDIR $GHN_HOME/
-RUN echo 1 | /bin/bash $GHN_HOME/setup.sh -n {{ ansible_hostname }} -f
-ADD d4s.authorization $CATALINA_HOME/lib/
-RUN ln -s $GHN_HOME/SmartGears/container.xml $GHN_HOME/container.xml
-RUN sed -ie 's/^$CATALINA_HOME\/bin\/startup.sh/$CATALINA_HOME\/bin\/catalina.sh\ run/' $GHN_HOME/startContainer.sh
-RUN sed -ie "s/<container mode='offline'>/<container mode='{{ container_mode }}'>/" $GHN_HOME/container.xml
-RUN sed -ie "s/<infrastructure>gcube<\/infrastructure>/<infrastructure>{{ infrastructure }}<\/infrastructure>/" $GHN_HOME/container.xml
-RUN sed -ie "/<\/infrastructure>/a \        <token>{{ token }}</token>" $GHN_HOME/container.xml
-
-EXPOSE 8080
-
-CMD ./startContainer.sh
diff --git a/smartgears/smartgears-container/templates/Dockerfile.bckp b/smartgears/smartgears-container/templates/Dockerfile.bckp
deleted file mode 100644
index 8d39cf33..00000000
--- a/smartgears/smartgears-container/templates/Dockerfile.bckp
+++ /dev/null
@@ -1,25 +0,0 @@
-from openjdk:7
-
-ENV GHN_HOME=/SmartGears-Bundle/
-ENV BUNDLE_HOME=$GHN_HOME
-ENV CATALINA_HOME=$GHN_HOME/tomcat/
-ENV CATALINA_OPTS="-Xmx2000m -Xms2000m -XX:MaxPermSize=512M" 
-ENV CATALINA_PID=$CATALINA_HOME/pid.txt
-
-#WORKDIR $GHN_HOME/
-
-RUN  \
-  wget http://maven.research-infrastructures.eu/nexus/service/local/repositories/{{ repo }}/content/org/gcube/distribution/smartgears-distribution-bundle/{{ smartgears_version }}/smartgears-distribution-bundle-{{ smartgears_version }}.tar.gz \
-  && tar xzvf smartgears-distribution-bundle-{{ smartgears_version }}.tar.gz \ #--strip-components=1 \
-  && rm smartgears-distribution-bundle-{{ smartgears_version }}.tar.gz \
-  && cd smartgears-distribution-bundle-{{ smartgears_version }} \
-  && echo 1 | /bin/bash ./setup.sh -n {{ hostname }} -f \
-  && ln -s $GHN_HOME/SmartGears/container.xml $GHN_HOME/container.xml \
-  && sed -ie 's/^$CATALINA_HOME\/bin\/startup.sh/$CATALINA_HOME\/bin\/catalina.sh\ run/' startContainer.sh \
-  && sed -ie "s/<container mode='offline'>/<container mode='{{ container_mode }}'>/" container.xml \
-  && sed -ie "s/<infrastructure>gcube<\/infrastructure>/<infrastructure>{{ infrastructure }}<\/infrastructure>/" container.xml \
-  && sed -ie "/<\/infrastructure>/a \        <token>{{ token }}</token>" container.xml
-
-EXPOSE 8080
-
-CMD /SmartGears-Bundle/startContainer.sh
diff --git a/smartgears/smartgears-container/templates/d4s.authorization b/smartgears/smartgears-container/templates/d4s.authorization
deleted file mode 100644
index 7e75ea64..00000000
--- a/smartgears/smartgears-container/templates/d4s.authorization
+++ /dev/null
@@ -1 +0,0 @@
-<authorization-endpoint priority="1" infrastructure="d4s"><host>{{ authorization_hostname }}</host><secure>false</secure><port>{{ authorization_port }}</port></authorization-endpoint>