diff --git a/docker/etl-rest-server/Dockerfile b/docker/etl-rest-server/Dockerfile
index 683c42b33..54d4da515 100755
--- a/docker/etl-rest-server/Dockerfile
+++ b/docker/etl-rest-server/Dockerfile
@@ -1,12 +1,12 @@
 FROM keymetrics/pm2:14-alpine
 COPY package.json /opt/etl/package.json
 RUN npm install -g --save-dev @babel/core @babel/node
-RUN npm install
 COPY . /opt/etl
 RUN apk add --no-cache git
 RUN rm -rf /opt/etl/conf
 RUN ls && pwd
 WORKDIR /opt/etl
+RUN npm install
 RUN apk add --no-cache tzdata
 ENV TZ Africa/Nairobi
 
diff --git a/programs/patient-program-config.json b/programs/patient-program-config.json
index 4331367e0..cfa7adede 100755
--- a/programs/patient-program-config.json
+++ b/programs/patient-program-config.json
@@ -4735,11 +4735,7 @@
         "encounterTypes": [
           {
             "uuid": "5e019c94-0f80-49b7-8593-28100eb4f787",
-            "display": "HEIFOLLOWUP",
-            "allowedIf": "screenedForCovidToday",
-            "errors": {
-              "covidError": "To access clinical forms kindly fill Covid 19 Assessment Form"
-            }
+            "display": "HEIFOLLOWUP"
           },
           {
             "uuid": "a44ad5e2-b3ec-42e7-8cfa-8ba3dbcf5ed7",
@@ -4787,19 +4783,11 @@
         "encounterTypes": [
           {
             "uuid": "5ef97eed-18f5-40f6-9fbf-a11b1f06484a",
-            "display": "LABORDERENCOUNTER",
-            "allowedIf": "screenedForCovidToday",
-            "errors": {
-              "covidError": "To access clinical forms kindly fill Covid 19 Assessment Form"
-            }
+            "display": "LABORDERENCOUNTER"
           },
           {
             "uuid": "5544894d-8add-4521-a0ea-c124c5886c8b",
-            "display": "POCLAB",
-            "allowedIf": "screenedForCovidToday",
-            "errors": {
-              "covidError": "To access clinical forms kindly fill Covid 19 Assessment Form"
-            }
+            "display": "POCLAB"
           },
           {
             "uuid": "466d6707-8429-4e61-b5a0-d63444f5ad35",
@@ -4817,11 +4805,7 @@
         "encounterTypes": [
           {
             "uuid": "10a86a62-b771-44d1-b1ad-3b8496c7bc47",
-            "display": "INPATIENTPEER",
-            "allowedIf": "screenedForCovidToday",
-            "errors": {
-              "covidError": "To access clinical forms kindly fill Covid 19 Assessment Form"
-            }
+            "display": "INPATIENTPEER"
           },
           {
             "uuid": "466d6707-8429-4e61-b5a0-d63444f5ad35",