diff --git a/Jenkinsfile b/Jenkinsfile
index 049f6e9075dba1a9cfb9cb497c6ee9cd648dbca6..29a41090482017060cefc623f8c21f6ca2688df2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,19 +1,37 @@
+def dockerImage
+
 pipeline {
-    agent none
-    stages {
-/*      stage('Test') {
-          agent { dockerfile true }
-            steps {
-                sh 'echo HOLA'
-            }
-        }
-*/
-        stage('Build') {
-            agent any
-            steps {
-                sh 'docker build .'
-                sh 'echo PUBLISH'
-            }
+  environment {
+    imagename = "opensourcemano/api-fe"
+    registryCredential = '<credentials>'  // To be updated with actual ID in the future
+  }
+  agent any
+  stages {
+    stage('Build API-FE image') {
+      steps{
+        sh "echo Building API-FE image"
+        script {
+          dockerImage = docker.build "${env.imagename}:${env.BUILD_NUMBER}"
         }
+      }
+    }
+    stage('Upload to Docker registry') {
+      steps{
+        sh "echo Here it would upload the image with appropriate tags: build number, latest"
+        /*script {
+          docker.withRegistry( '', registryCredential ) {
+            dockerImage.push("${env.BUILD_NUMBER}")
+            dockerImage.push('latest')
+          }
+        }*/
+      }
+    }
+    stage('Remove unused Docker image') {
+      steps{
+        sh "docker rmi ${imagename}:${BUILD_NUMBER}"
+        // Commented until "upload" stage can be uncommented as well
+        //sh "docker rmi ${imagename}:latest"
+      }
     }
+  }
 }