diff --git a/aws/alastria/node/Chart.yaml b/aws/alastria/node/Chart.yaml
deleted file mode 100644
index f91af38d..00000000
--- a/aws/alastria/node/Chart.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v2
-name: alastria
-description: Helm chart for running an alastria regular node
-type: application
-version: 0.0.1
-appVersion: "testnet2"
diff --git a/aws/alastria/node/templates/_helpers.tpl b/aws/alastria/node/templates/_helpers.tpl
deleted file mode 100644
index ecd52bfe..00000000
--- a/aws/alastria/node/templates/_helpers.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "alastria.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "alastria.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "alastria.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "alastria.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "alastria.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "alastria.labels" -}}
-app.kubernetes.io/name: {{ include "alastria.name" . }}
-helm.sh/chart: {{ include "alastria.chart" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-
-{{- define "alastria.secretName" -}}
-    {{- if .Values.existingSecret -}}
-        {{- printf "%s" (tpl .Values.existingSecret $) -}}
-    {{- else -}}
-        {{- printf "%s" (include "alastria.fullname" .) -}}
-    {{- end -}}
-{{- end -}}
\ No newline at end of file
diff --git a/aws/alastria/node/templates/route.yaml b/aws/alastria/node/templates/route.yaml
deleted file mode 100644
index 6fee201f..00000000
--- a/aws/alastria/node/templates/route.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-{{- if .Values.route.enabled -}}
-{{- $fullName := include "alastria.fullname" . -}}
-apiVersion: route.openshift.io/v1
-kind: Route
-metadata:
-  name: {{ include "alastria.fullname" . }}
-  labels:
-    {{ include "alastria.labels" . | nindent 4 }}
-  {{- if .Values.route.annotations }}
-  annotations:
-    {{- with .Values.route.annotations }}
-      {{- toYaml . | nindent 4 }}
-      {{- end }}
-  {{- end }}
-spec:
-  {{- if .Values.route.host }}
-  host: {{ .Values.route.host }}
-  {{- end }}
-  port:
-    targetPort: 21000
-  to:
-    kind: Service
-    name: {{ $fullName }}
----
-apiVersion: route.openshift.io/v1
-kind: Route
-metadata:
-  name: {{ include "alastria.fullname" . }}-monitoring
-  labels:
-    {{ include "alastria.labels" . | nindent 4 }}
-  {{- if .Values.route.annotations }}
-  annotations:
-    {{- with .Values.route.annotations }}
-      {{- toYaml . | nindent 4 }}
-      {{- end }}
-  {{- end }}
-spec:
-  {{- if .Values.route.host }}
-  host: {{ .Values.route.host }}
-  {{- end }}
-  port:
-    targetPort: 6060
-  to:
-    kind: Service
-    name: {{ $fullName }}
-{{- end }}
\ No newline at end of file
diff --git a/aws/alastria/node/templates/service.yaml b/aws/alastria/node/templates/service.yaml
deleted file mode 100644
index 69d34202..00000000
--- a/aws/alastria/node/templates/service.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "alastria.fullname" . }}
-  {{- if .Values.service.annotations }}
-  annotations:
-    {{ toYaml .Values.service.annotations | nindent 4 }}
-  {{- end }}
-  labels:
-    {{ include "alastria.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: 21000
-      targetPort: 21000
-      protocol: TCP
-      name: geth
-    - port: 6060
-      targetPort: 6060
-      protocol: TCP
-      name: monitoring
-  selector:
-    app.kubernetes.io/name: {{ include "alastria.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
\ No newline at end of file
diff --git a/aws/alastria/node/templates/statefulset.yaml b/aws/alastria/node/templates/statefulset.yaml
deleted file mode 100644
index 912c4acb..00000000
--- a/aws/alastria/node/templates/statefulset.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ include "alastria.fullname" . }}
-  labels:
-    {{ include "alastria.labels" . | nindent 4 }}
-spec:
-  replicas: 1
-  revisionHistoryLimit: {{ .Values.statefulset.revisionHistoryLimit }}
-  serviceName: {{ include "alastria.fullname" . }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "alastria.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        {{ include "alastria.labels" . | nindent 8 }}
-          {{- with .Values.statefulset.additionalLabels }}
-          {{- toYaml . | nindent 8 }}
-          {{- end }}
-      {{- if .Values.statefulset.additionalAnnotations -}}
-      annotations:
-        prometheus.io/scrape: {{ .Values.prometheus.enabled | quote }}
-        prometheus.io/path: {{ .Values.prometheus.path }}
-        prometheus.io/port: 6060
-        {{- with .Values.statefulset.additionalAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      {{- end }}
-    spec:
-      serviceAccountName: {{ include "alastria.serviceAccountName" . }}
-      containers:
-        - name: {{ .Chart.Name }}
-          imagePullPolicy: {{ .Values.statefulset.image.pullPolicy }}
-          image: "{{ .Values.statefulset.image.repository }}:{{ .Values.statefulset.image.tag }}"
-          ports:
-            - name: geth
-              containerPort: 21000
-              protocol: TCP
-            - name: http
-              containerPort: 22000
-              protocol: TCP
-            - name: constellation
-              containerPort: 9000 
-              protocol: TCP
-            - name: websocket
-              containerPort: 80
-              protocol: TCP
-            - name: statistics
-              containerPort: 8086
-              protocol: TCP
-            - name: resolver
-              containerPort: 53
-              protocol: TCP
-            - name: prometheus
-              containerPort: 6060
-              protocol: TCP
-          env:
-            - name: NODE_NAME
-              value: {{ .Values.node.name | quote }}
-            - name: NODE_TYPE
-              value: {{ .Values.node.type | quote }}
-            - name: NODE_BRANCH
-              value: {{ .Values.node.branch | quote }}
-            - name: EXTERNAL_IP
-              value: {{ .Values.node.externalIp | quote }}
-            {{- with .Values.additionalEnvVars }}
-            {{- toYaml . | nindent 12 }}
-            {{- end }}
-          {{- with .Values.statefulset.resources }}
-          resources:
-            limits:
-              cpu: {{ .Values.node.cpu }}
-              memory: {{ .Values.node.ram }}Gi
-              requests:
-                cpu: {{ .Values.node.cpu }}
-                memory:  {{ .Values.node.cpu }}Gi
-          {{- end }}
-          volumeMounts:
-            - name: work-dir
-              mountPath: /opt/alastria/data
-      {{- with .Values.statefulset.nodeSelector }}
-      nodeSelector:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.statefulset.affinity }}
-      affinity:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.statefulset.tolerations }}
-      tolerations:
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-  volumeClaimTemplates:
-  - metadata:
-      name: work-dir
-      {{- with .Values.statefulset.additionalAnnotations }}
-      annotations:
-        {{ toYaml . | indent 8 }}
-      {{- end }}
-      labels:
-        {{- include "alastria.labels" . | nindent 8 }}
-    spec:
-      accessModes: [ "ReadWriteOnce" ]
-      resources:
-          requests:
-              storage: {{ .Values.node.storageSize | quote }}
\ No newline at end of file
diff --git a/aws/alastria/node/values.yaml b/aws/alastria/node/values.yaml
deleted file mode 100644
index 5a52f58e..00000000
--- a/aws/alastria/node/values.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-## Default values for canismajor.
-## This is a YAML-formatted file.
-## Declare variables to be passed into your templates.
-
-# -- option to override the name config in the _helpers.tpl
-nameOverride: ""
-# -- option to override the fullname config in the _helpers.tpl
-fullnameOverride: ""
-
-## configuration for the k8s service to access canismajor
-service:
-  # -- service type
-  type: LoadBalancer
-  # -- addtional annotations, if required
-  annotations: {}
-
-# -- if a canismajor specific service account should be used, it can be configured here
-# ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
-serviceAccount:
-  # -- specifies if the account should be created
-  create: false
-
-# information corresponding to this alastria node
-node:
-  # name of the node
-  name: FIWARE
-  # type of the node
-  type: validator
-  # branch to request nodes from
-  branch: main
-  # external ip
-  externalIp: 3.126.172.69
-  # cpus to be used for the node
-  cpu: 2
-  # ram to be assigned to the node
-  ram: 4
-  # storage to be reservede
-  storageSize: 256Gi
-
-## statefulset specific configuration
-statefulset:
-  # -- number of old replicas to be retained
-  revisionHistoryLimit: 3
-  ## configuration of the image to be used
-  image:
-    # -- canismajor image name
-    # ref: https://quay.io/repository/fiware/canis-major
-    repository: quay.io/wi_stefan/alastria-node
-    # -- tag of the image to be used
-    tag: 0.0.2
-    # -- specification of the image pull policy
-    pullPolicy: IfNotPresent
-
-  # -- additional labels for the statefulset, if required
-  additionalLabels: {}
-  # -- additional annotations for the statefulset, if required
-  additionalAnnotations: {}
-  # -- selector template
-  # ref: https://kubernetes.io/docs/user-guide/node-selection/
-  nodeSelector: {}
-  # -- tolerations template
-  # ref: ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-  tolerations: []
-  # -- affinity template
-  # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-  affinity: {}
-  ## liveness and readiness probes of the canismajor broker, they will be evaluated against the version endpoint
-  # ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
-  livenessProbe:
-    initialDelaySeconds: 30
-    periodSeconds: 10
-    successThreshold: 1
-    timeoutSeconds: 30
-  readinessProbe:
-    initialDelaySeconds: 31
-    periodSeconds: 10
-    successThreshold: 1
-    timeoutSeconds: 30
-
-## openshift specific route definition. Will not work on plain k8s
-route:
-  ## -- should the deployment create openshift routes
-  enabled: false
-  # -- annotations to be added to the route
-  annotations: {}
-  # -- host to be used
-  # host: localhost
-
-## configuration for prometheus montioring
-prometheus:
-  # -- should prometheus scrape be enabled
-  enabled: true
-  # -- path for prometheus scrape
-  path: /prometheus
-
-# -- a list of additional env vars to be set, check the canismajor docu for all available options
-additonalEnvVars: []
-
diff --git a/aws/apps/alastria/alastria-node.yaml b/aws/apps/alastria/alastria-node.yaml
deleted file mode 100644
index 4383dfd7..00000000
--- a/aws/apps/alastria/alastria-node.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: alastria-node
-  namespace: argocd
-spec:
-  destination:
-    namespace: alastria
-    server: https://kubernetes.default.svc
-  project: default
-  source:
-    path: aws/alastria/node
-    repoURL: https://github.com/FIWARE-Ops/fiware-gitops
-    targetRevision: HEAD
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
\ No newline at end of file
diff --git a/aws/namespaces/alastria.yaml b/aws/namespaces/alastria.yaml
deleted file mode 100644
index bd7905f9..00000000
--- a/aws/namespaces/alastria.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: alastria
\ No newline at end of file