diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8728a5200e5b35a13d0fa721c1420c0c488382f5
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,48 @@
+# CI/CD:
+# * branch      Continuously Builds & Push TOSCA parser image
+
+#image: docker:latest
+
+#services:
+#  - docker:dind
+
+variables:
+  GIT_DEPTH: "3"
+
+stages:
+  - build
+  - test
+
+build-tosca-toolbox:
+  stage: build
+  script:
+    - echo "Building Cloudnet-TOSCA-toolbox image..."
+    - ./scripts/build_tosca_parser.sh -v "Cloudnet-TOSCA-toolbox"
+    - echo "Build finished"    
+    
+build-tosca-puccini:
+  stage: build
+  script:
+    - echo "Building Puccini image..."
+    - ./scripts/build_tosca_parser.sh -v "Puccini"
+    - echo "Build finished"    
+
+test-definitions-cloudnet:
+  stage: test
+  script:
+    - echo "Parsing TOSCA definitions"
+    - ./scripts/parse_tosca_definitions.sh -v "Cloudnet-TOSCA-toolbox"
+  artifacts:
+    when: always
+    paths:
+      - debugCloudnet.log
+      
+test-definitions-puccini:
+  stage: test
+  script:
+    - echo "Parsing TOSCA definitions"
+    - ./scripts/parse_tosca_definitions.sh -v "Puccini"
+  artifacts:
+    when: always
+    paths:
+      - debugPuccini.log
diff --git a/README.md b/README.md
index ba701a73ca68c720579bdc63c53ef525fdff8dec..7c3277054c1f76eac1537409362fc442c9a61e23 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This repository contains Application Package Format and Descriptor specified in
 
 ## Online resources
 
-
+  
 
 ## License
 
diff --git a/scripts/Dockerfile.puccini b/scripts/Dockerfile.puccini
new file mode 100644
index 0000000000000000000000000000000000000000..ff4187850cac0a11c97a988f1ee15abc7e1e25a0
--- /dev/null
+++ b/scripts/Dockerfile.puccini
@@ -0,0 +1,14 @@
+FROM ubuntu:16.04
+
+#COPY requirements.txt /requirements.txt
+RUN apt-get update && apt-get install -y -qq curl git gcc
+RUN curl -OL https://golang.org/dl/go1.18.3.linux-amd64.tar.gz
+RUN tar -C /usr/local -xzf go1.18.3.linux-amd64.tar.gz
+
+ENV PATH="${PATH}:/usr/local/go/bin"
+
+RUN git clone https://github.com/tliron/puccini.git /puccini
+
+RUN ./puccini/scripts/build
+
+ENV PATH="${PATH}:/root/go/bin"
diff --git a/scripts/build_tosca_parser.sh b/scripts/build_tosca_parser.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9f68332e5c80e28dc698d60eee561aa420029899
--- /dev/null
+++ b/scripts/build_tosca_parser.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+TOSCA_PARSER="Cloudnet-TOSCA-toolbox"
+GIT_URL_TOSCA_TOOLBOX="https://github.com/Orange-OpenSource/Cloudnet-TOSCA-toolbox.git"
+TOSCA_PARSER_FOLDER="tosca-parser/"
+
+while getopts v: flag
+do
+        case "${flag}" in
+                v) TOSCA_PARSER=${OPTARG};;
+        esac
+done
+
+if [ ${TOSCA_PARSER} == "Cloudnet-TOSCA-toolbox" ] ; then
+	# clone robot tests
+    git clone $GIT_URL_TOSCA_TOOLBOX $TOSCA_PARSER_FOLDER
+    cd $TOSCA_PARSER_FOLDER
+	
+    docker build -t cloudnet/toscaware bin/toscaware
+	
+	#pwd
+	#docker run -v "${PWD}:/work" -v "${PWD}/bin/cloudnet:/cloudnet" --workdir="/work" cloudnet/toscaware /bin/sh -c "echo Building image"
+	#docker run --name=tosca-parser -v "${PWD}:/work" --workdir="/work" cloudnet/toscaware /bin/sh -c "ls"
+	#sleep 5;
+	#container_to_update=`docker ps -n 1 --format '{{.Names}}'`
+	#echo "Creating updated image from container ${container_to_update}"
+	#docker container commit ${container_to_update} cloudnet/toscaware:latest
+	#echo "Deleting old container ${container_to_update}"
+	#docker container rm ${container_to_update}
+
+elif [ ${TOSCA_PARSER} == "Puccini" ] ; then
+	#Build Puccini docker from Dockerfile
+	docker build -t puccini -f scripts/Dockerfile.puccini .
+	
+fi
+
+exit
diff --git a/scripts/parse_tosca_definitions.sh b/scripts/parse_tosca_definitions.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d2ff06c0c22e64e0926694790279dd333705807b
--- /dev/null
+++ b/scripts/parse_tosca_definitions.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+TOSCA_PARSER="Cloudnet-TOSCA-toolbox"
+GIT_URL_TOSCA_TOOLBOX="https://github.com/Orange-OpenSource/Cloudnet-TOSCA-toolbox.git"
+TOSCA_PARSER_FOLDER="tosca-parser/"
+
+while getopts v: flag
+do
+        case "${flag}" in
+                v) TOSCA_PARSER=${OPTARG};;
+        esac
+done
+
+if [ ${TOSCA_PARSER} == "Cloudnet-TOSCA-toolbox" ] ; then
+	# Parse TOSCA definitions
+	echo "Cloudnet-TOSCA-toolbox: Validation starting ..."
+	# Cloudnet-TOSCA-toolbox 
+    git clone $GIT_URL_TOSCA_TOOLBOX $TOSCA_PARSER_FOLDER
+    
+	mkdir ${TOSCA_PARSER_FOLDER}examples/mec037
+	cp *.yaml -t ${TOSCA_PARSER_FOLDER}examples/mec037
+	
+	cd ${TOSCA_PARSER_FOLDER}examples/mec037
+	
+	CLOUDNET_BINDIR=../../bin  
+	. ${CLOUDNET_BINDIR}/cloudnet_rc.sh
+	
+	finalResult=0
+	for i in *.yaml ; do
+    
+		result=0
+		echo "Cloudnet-TOSCA-toolbox: Validating file $i..." >> debugCloudnet.log
+		../../bin/toscaware/toscaware $i &> debug.log
+		#docker ${DOCKER_OPTS} run --user "$(id -u)":"$(id -g)" -v "${PWD}/${TOSCA_PARSER_FOLDER}:/work" -v "${PWD}/${TOSCA_PARSER_FOLDER}/bin/cloudnet:/cloudnet" --workdir="/work" --rm --attach=stdin --attach=stdout --attach=stderr cloudnet/toscaware python ${PYTHON_OPTS} /cloudnet/tosca/tosca2cloudnet.py --template-file "$i" ${TOSCAWARE_OPTS}
+		
+		#docker ${DOCKER_OPTS} run --user "$(id -u)":"$(id -g)" --rm --attach=stdin --attach=stdout --attach=stderr cloudnet/toscaware python ${PYTHON_OPTS} /cloudnet/tosca/tosca2cloudnet.py --template-file "$1" ${TOSCAWARE_OPTS}
+		#./${TOSCA_PARSER_FOLDER}/bin/toscaware/toscaware $i $> debug.log
+
+		if [ $? == 2 ] ; then
+
+			echo "Cloudnet-TOSCA-toolbox: ++++ Issues found with TOSCA file syntax in $i"
+			grep "ERROR" < debug.log
+			finalResult=1
+		else
+			echo "Cloudnet-TOSCA-toolbox: ++++ TOSCA parser finished validation of $i"
+			#Check the debug messages, if there's at least one ERROR then res=1
+			if [ `grep "ERROR" < debug.log | wc -l` == 0 ] ; then
+				echo "++++ TOSCA parser finished validation of $i with no errors"
+			else
+				echo "Cloudnet-TOSCA-toolbox: ++++ TOSCA parser finished validation of $i with errors"
+				grep "ERROR" < debug.log
+				finalResult=1
+			fi
+		fi 
+		cat debug.log >> debugCloudnet.log
+	done
+	
+	cp debugCloudnet.log ../../../debugCloudnet.log
+elif [ ${TOSCA_PARSER} == "Puccini" ] ; then
+	finalResult=0
+	echo "Puccini: Validation starting ..."
+		
+	docker run --rm -v "${PWD}:/mec037" puccini ./mec037/scripts/puccini_parse.sh &> debugPuccini.log
+		
+	if [ $? == 0 ] ; then
+		echo "Puccini: ++++ TOSCA parser finished validation with no errors"
+	elif  [ $? == 1 ] ; then
+		echo "Puccini: ++++ TOSCA parser finished validation with errors"
+			#Check the debug messages, if there's at least one ERROR then res=1
+			#if [ `grep "PROBLEMS" < debug.log | wc -l` > 0 ] ; then
+			#	echo "Puccini: ++++ ERRORS: "
+			#	grep "PROBLEMS" < debug.log
+			#	res=1
+			#fi
+			finalResult=1
+	fi 
+		
+fi
+
+exit $finalResult
\ No newline at end of file
diff --git a/scripts/puccini_parse.sh b/scripts/puccini_parse.sh
new file mode 100755
index 0000000000000000000000000000000000000000..19caa486fdd66d89d758991a36e2de66eee1be99
--- /dev/null
+++ b/scripts/puccini_parse.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+res=0
+for i in /mec037/*.yaml ; do
+
+	echo "Puccini: Validating file $i..."
+	
+	puccini-tosca parse $i
+	
+	if [ $? == 1 ] ; then
+		res=1
+	fi 
+	
+done
+exit $res
\ No newline at end of file