diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad803984fe9c6c9ef22c697848a5bfa32caba925..06cd4a6695f1db48385771b6d2405be5d02cee24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ include:
       - ci-templates/default.yml
       - ci-templates/build.yml
     rules:
-      - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
+      - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'
 
   - project: osl/code/org.etsi.osl.main
     ref: develop
@@ -29,7 +29,7 @@ include:
       - ci-templates/default.yml
       - ci-templates/build_unprotected.yml
     rules:
-      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'
+      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"'
 
 angular_build:
   extends: .angular_build
diff --git a/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html b/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html
index bdf2699a96bdb0a2024b74b4f84e7110f34e2913..5dab83e7501c57fab5cb5ad5e525291a82d43afd 100644
--- a/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html
+++ b/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html
@@ -146,7 +146,7 @@
                                     {{ note.text }}
                                     <div class="small">
                                       written by {{ note.author }} @
-                                      {{ note.date | date: "d MMM y, h:mm a" }}
+                                      {{ note.date | date: "d MMM y, h:mm:ss a" }}
                                     </div>
                                   </div>
                                 </div>
diff --git a/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.scss b/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.scss
index 3cf02338086e3803ce0b669bceda6a875346c3b5..bc0591a14a97a34a1ada73b154a7a0eef771a184 100644
--- a/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.scss
+++ b/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.scss
@@ -14,3 +14,8 @@
 .tab-pane > .card:nth-child(1) {
     min-height: max(350px, 20vh);
 }
+
+.notes-container {
+    max-height: 265px;
+    overflow-y: auto;
+}
\ No newline at end of file
diff --git a/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts b/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts
index 1727f5c9c254102f719f10f920d9f24395f64382..4ea9e877f58d375811533e0b556e88c6bf7e4c0d 100644
--- a/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts
+++ b/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts
@@ -84,7 +84,7 @@ export class ResourceReservationCalendarComponent implements OnInit {
             this.reservations
             ).map(function(eventEl: Reservation) {
               
-              console.info("this is event: " + eventEl.id +" " + eventEl.requestedPeriodStartDateTime  )
+              // console.info("this is event: " + eventEl.id +" " + eventEl.requestedPeriodStartDateTime  )
               // var result = new Date(eventEl.startDate);
               // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today
               
diff --git a/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts b/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts
index 95b988e08e4f6e31643be2fa5f1043c025d78f39..fd2594f39f3eed330f695050ed4079396b86a418 100644
--- a/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts
+++ b/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts
@@ -109,7 +109,7 @@ export class ListServiceOrdersComponent implements OnInit {
             this.serviceOrders
             ).map(function(eventEl: ServiceOrder) {
               
-              console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate )
+              // console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate )
               // var result = new Date(eventEl.startDate);
               // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today
               
diff --git a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html
index 92974ea81aeb756bf96c871ddcf5faad53e1673b..950134db23348996a1344bf7092a091fe6e3e606 100644
--- a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html
+++ b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html
@@ -155,12 +155,12 @@
                                                         </mat-form-field> -->
                                                     </div>
                                                     <div class="col-lg-6">
-                                                        <ng-container *ngIf="!editMode">
+                                                        <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                             <h6>State</h6>
                                                             <p [ngClass]="orderStateClassSelector(serviceOrder?.state)"><b>{{serviceOrder?.state}}</b></p>
                                                         </ng-container>
                 
-                                                        <mat-form-field *ngIf="editMode">
+                                                        <mat-form-field *ngIf="editMode && isAdminUser">
                                                             <mat-label>State</mat-label>
                                                             <mat-select formControlName="state">
                                                                 <ng-container *ngIf="serviceOrder?.state === 'INITIAL'">
@@ -181,7 +181,7 @@
                                                     </div>
                 
                                                     <div class="col-lg-6">
-                                                        <ng-container *ngIf="!editMode">
+                                                        <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                             <h6>Starting Date</h6>
                                                             <div *ngIf="serviceOrder?.startDate">
                                                                 <p class="mb-0">{{serviceOrder?.startDate | date:'d MMM y, h:mm a'}} - Local Time</p>
@@ -189,7 +189,7 @@
                                                             </div>
                                                         </ng-container>
                 
-                                                        <mat-form-field *ngIf="editMode" [owlDateTimeTrigger]="pickerFrom" class="mb-2">
+                                                        <mat-form-field *ngIf="editMode && isAdminUser" [owlDateTimeTrigger]="pickerFrom" class="mb-2">
                                                             <mat-label>Starting Date</mat-label>
                                                             <input matInput [owlDateTime]="pickerFrom" placeholder="Date Time"
                                                                 formControlName="startDate">
@@ -200,7 +200,7 @@
                                                     </div>
                 
                                                     <div class="col-lg-6">
-                                                        <ng-container *ngIf="!editMode">
+                                                        <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                             <h6>Expected Completion Date</h6>
                                                             <div *ngIf="serviceOrder?.expectedCompletionDate">
                                                                 <p class="mb-0">{{serviceOrder?.expectedCompletionDate | date:'d MMM y, h:mm a'}} - Local Time</p>
@@ -209,7 +209,7 @@
 
                                                         </ng-container>
                 
-                                                        <mat-form-field *ngIf="editMode" [owlDateTimeTrigger]="pickerUntil" class="mb-2">
+                                                        <mat-form-field *ngIf="editMode && isAdminUser" [owlDateTimeTrigger]="pickerUntil" class="mb-2">
                                                             <mat-label>Expected Completion Date </mat-label>
                                                             <input matInput [owlDateTime]="pickerUntil" placeholder="Date Time"
                                                                 formControlName="expectedCompletionDate">
diff --git a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts
index 69c43d678ea6f93ee88347b741bd36c09ae098bb..37851f03498204f0f25f09b81d45c69f6894bc77 100644
--- a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts
+++ b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts
@@ -58,8 +58,8 @@ export class PreviewServiceOrderComponent implements OnInit {
   serviceOrderNotFound: boolean = false
   finishedLoading: boolean = false
 
-  supportingServices: Service[][] = [[]]
-
+  supportingServices: Service[][] = []
+  // supportingServices' first array is Order Item Index and second array is SupportingService index of the respective Order Item
   editMode: boolean = false
   editModeNotes: boolean = false
   isAdminUser: boolean = false
@@ -122,18 +122,26 @@ export class PreviewServiceOrderComponent implements OnInit {
   
           this.checkboxesOrderItemList = []
           this.currentItemRelationshipsUrl = []
-          this.serviceOrder.orderItem.forEach((orderItem, index) => {
+          
+          this.supportingServices = []
+          this.serviceOrder.orderItem.forEach((orderItem) => {
+            
+            //Expands the length of the array for each Service Order Item
+            this.supportingServices.push([])
 
             this.checkboxesOrderItemList.push({orderItem: orderItem, isChecked: false})
 
             orderItem.service.serviceCharacteristic.sort(this.sortingService.ascStringSortingFunctionByNameProperty())
   
-            orderItem.service.supportingService.forEach( (supService, serviceIndex) => {
-              this.retrieveServiceInventory(supService.id).pipe(delay(Math.random()*1000)).subscribe(
-                data => this.supportingServices[index][serviceIndex] = data
+            orderItem.service.supportingService.forEach( (supService) => {
+              this.retrieveServiceInventory(supService.id).subscribe(
+                data => {
+                  const orderItemIndex = this.serviceOrder.orderItem.findIndex(SOI => orderItem.id === SOI.id)
+                  const supportingServiceIndex = this.serviceOrder.orderItem[orderItemIndex].service.supportingService.findIndex(SupS => supService.id === SupS.id)
+                  this.supportingServices[orderItemIndex][supportingServiceIndex] = data
+                }
               )
             })
-
             
             this.currentItemRelationshipsUrl.push( this.orderService.rootUrl + "/serviceOrdering/v4/serviceOrder/" + this.serviceOrder.id + "/item/" + orderItem.id + "/relationship_graph" );
           })
diff --git a/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts b/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts
index 8daf914b8e623cfb0a4f57742fd4a7e312d43420..39e0af63c41a3a8bdabc161cc5490182a2c4b1ea 100644
--- a/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts
+++ b/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts
@@ -69,7 +69,7 @@ export class ServiceOrdersCalendarComponent implements OnInit {
             this.serviceOrders
             ).map(function(eventEl: ServiceOrder) {
               
-              console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate )
+              // console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate )
               // var result = new Date(eventEl.startDate);
               // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today
               
diff --git a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html
index 7296ad1752769f069bfd7f1f5c53f76ea3df3b46..fc1630d5f3ea978d767bdec37f5fb1aa179be7a2 100644
--- a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html
+++ b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html
@@ -61,13 +61,13 @@
                                                   </div>
 
                                                   <div class="col-lg-4">
-                                                      <ng-container *ngIf="!editMode">
+                                                      <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                           <h6>State</h6>
                                                           <p [ngClass]="serviceStateClassSelector(service?.state)">
                                                               <b>{{service?.state}}</b></p>
                                                       </ng-container>
 
-                                                      <mat-form-field *ngIf="editMode">
+                                                      <mat-form-field *ngIf="editMode && isAdminUser">
                                                           <mat-label>State</mat-label>
                                                           <mat-select formControlName="state">
                                                               <mat-option *ngFor="let state of availableStates"
@@ -116,7 +116,7 @@
                                               <div class="row">
 
                                                   <div class="col-lg-4">
-                                                      <ng-container *ngIf="!editMode">
+                                                      <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                           <h6>Starting Date</h6>
                                                           <p [class.mb-0]="service?.startDate"
                                                               *ngIf="service?.startDate">
@@ -127,7 +127,7 @@
                                                               UTC</p>
                                                       </ng-container>
 
-                                                      <mat-form-field *ngIf="editMode"
+                                                      <mat-form-field *ngIf="editMode && isAdminUser"
                                                           [owlDateTimeTrigger]="pickerFrom" class="mb-2">
                                                           <mat-label>Starting Date</mat-label>
                                                           <input matInput [owlDateTime]="pickerFrom"
@@ -142,7 +142,7 @@
                                                   </div>
 
                                                   <div class="col-lg-4">
-                                                      <ng-container *ngIf="!editMode">
+                                                      <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                           <h6>Ending Date</h6>
                                                           <p [class.mb-0]="service?.endDate" *ngIf="service?.endDate">
                                                               {{service?.endDate | date:'d MMM y, h:mm a'}} - Local
@@ -152,7 +152,7 @@
                                                               UTC</p>
                                                       </ng-container>
 
-                                                      <mat-form-field *ngIf="editMode"
+                                                      <mat-form-field *ngIf="editMode && isAdminUser"
                                                           [owlDateTimeTrigger]="pickerFrom" class="mb-2">
                                                           <mat-label>Ending Date</mat-label>
                                                           <input matInput [owlDateTime]="pickerFrom"
diff --git a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.ts b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.ts
index 715e06314352506b5eb4caa1d39134ff3ea3f7c3..4b56a2c239e6fd28c48a0e0afae42c40b4e6877f 100644
--- a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.ts
+++ b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.ts
@@ -52,6 +52,7 @@ export class PreviewServiceComponent implements OnInit {
     endDate: new FormControl()
   })
   editMode: boolean = false
+  isAdminUser: boolean = false
 
   newNote: boolean = false
   availableStates = ['feasibilityChecked', 'designed', 'reserved', 'inactive', 'active', 'terminated']
@@ -64,6 +65,7 @@ export class PreviewServiceComponent implements OnInit {
   jsonEditorOptions = new JsonEditorOptions()
 
   ngOnInit() {
+    this.isAdminUser = this.authService.portalUserJWT.realm_access.roles.includes('ADMIN')
 
     this.initSubscriptions()
 
diff --git a/src/app/shared/components/contact/contact.component.html b/src/app/shared/components/contact/contact.component.html
index c496ccb15add347f8f4a66b0d005a655ba3fb5c2..d7c57aec8992484becd48f86981e0f9beccf321c 100644
--- a/src/app/shared/components/contact/contact.component.html
+++ b/src/app/shared/components/contact/contact.component.html
@@ -6,7 +6,7 @@
                 <h3>Who we are</h3>
                 <div *ngIf="!customIntroductionHTML">
                     <address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span> | <a
-                            href='https://osl.etsi.org/' class='text-white'>https://osl.etsi.org</a><br>The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network Slice as a Service (NSaaS).</address>
+                            href='https://osl.etsi.org/' class='text-white'>https://osl.etsi.org</a><br>The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network as a Service (NaaS).</address>
                     <address class='font-weight-light'><span class='font-weight-bold'>{{config.TITLE}}</span> | <a
                             href='{{config.WEBURL}}' class='text-white'>{{config.WEBURL}}</a><br>A portal that allows 5G
                         experimenters to design and deploy network services towards the infrastructure.</address>
diff --git a/src/assets/config/config.prod.default.json b/src/assets/config/config.prod.default.json
index 0465cdc3d5adb47e1f414ceac3095c1a551d8b85..8acbcb4b5cf3aeeeffc80418a04e44706e044605 100644
--- a/src/assets/config/config.prod.default.json
+++ b/src/assets/config/config.prod.default.json
@@ -1,6 +1,6 @@
 {	      
     "TITLE": "OpenSlice by ETSI",
-    "PORTALVERSION":"2024Q2",
+    "PORTALVERSION":"2024Q4",
     "WIKI": "https://osl.etsi.org/documentation",
     "BUGZILLA": "{BASEURL}/bugzilla/",
     "STATUS": "{BASEURL}/healthstatus/",
diff --git a/src/assets/config/config.theming.default.json b/src/assets/config/config.theming.default.json
index bcb6a64f806d5533abc6249e4e5dc37276361100..312428f1d39ebc64a790dd4dc95b4850403e903f 100644
--- a/src/assets/config/config.theming.default.json
+++ b/src/assets/config/config.theming.default.json
@@ -3,7 +3,7 @@
     "DEPLOYMENT_LOGO_PATH":"assets/images/logo_clear.png",
     "DEFAULT_SERVICE_LOGO_PATH":"assets/images/logo_icon_original.png",
     "FAVICON_PATH":"favicon.ico",   
-    "WHO_WE_ARE_HTML":"<address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span>|<a href='https://osl.etsi.org/' class='text-white'>https://osl.etsi.org</a><br>The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network Slice as a Service (NSaaS).</address><address class='font-weight-light'><span class='font-weight-bold'>OpenSlice by ETSI</span>|<a href='http' class='text-white'>http://portal.openslice.io</a><br>A portal that allows 5G experimenters to design and deploy network services towards the infrastructure.</address><address class='font-weight-light'><span class='font-weight-bold'>OpenSlice by ETSI wiki</span>|<a href='https://osl.etsi.org/documentation' class='text-white'>https://osl.etsi.org/documentation</a><br>A wiki containing OpenSlice software documentation.</address>",
+    "WHO_WE_ARE_HTML":"<address class='font-weight-light'><span class='font-weight-bold'>ETSI SDG OpenSlice</span>|<a href='https://osl.etsi.org/' class='text-white'>https://osl.etsi.org</a><br>The ETSI Software Development Group for OpenSlice (SDG OSL) is developing an open source service based Operations Support System (OSS) to deliver Network as a Service (NaaS).</address><address class='font-weight-light'><span class='font-weight-bold'>OpenSlice by ETSI</span>|<a href='http' class='text-white'>http://portal.openslice.eu</a><br>A portal that allows 5G experimenters to design and deploy network services towards the infrastructure.</address><address class='font-weight-light'><span class='font-weight-bold'>OpenSlice by ETSI wiki</span>|<a href='https://osl.etsi.org/documentation' class='text-white'>https://osl.etsi.org/documentation</a><br>A wiki containing OpenSlice software documentation.</address>",
     "CONNECT_WITH_US_HTML":"<div class='col-lg-3 col-md-6 col-sm-12'><div><a class='font-weight-light text-white' href='https://www.linkedin.com/company/openslice'><i class='fab mr-2 fa-linkedin'></i>LinkedIn</a></div></div><div class='col-lg-3 col-md-6 col-sm-12'><div><a class='font-weight-light text-white' href='https://openslice.slack.com/'><i class='fab mr-2 fa-slack'></i>Slack</a></div></div><div class='col-lg-3 col-md-6 col-sm-12'><div><a class='font-weight-light text-white' href='https://twitter.com/OpensliceOSS'><i class='fab mr-2 fa-twitter'></i>Twitter</a></div></div>",
-    "FOOTER_HTML":"<div class='row align-items-center'><div class='col-md-2'><img src='assets/images/eu-commission.png'></div><div class='col-md-10 font-weight-light'><div class='font-weight-light'>OpenSlice has received funding from various projects under European Programmes for research, technological development and demonstration. You may refer to our extensive <a href='https://osl.etsi.org/ecosystem/'>ecosystem</a> for further details.</div><div class='font-weight-light'>Openslice by ETSI running OSL version 2024Q2 | <a href='https://osl.etsi.org/files/SDG_OSL_Terms_and_Conditions.pdf' class='font-weight-light'>Terms and Conditions</a> | &copy; 2024 on behalf of <a target='_blank' href='https://osl.etsi.org/' title='osl.etsi.org' class='font-weight-light'>osl.etsi.org</a></div></div></div>"
+    "FOOTER_HTML":"<div class='row align-items-center'><div class='col-md-2'><img src='assets/images/eu-commission.png'></div><div class='col-md-10 font-weight-light'><div class='font-weight-light'>OpenSlice has received funding from various projects under European Programmes for research, technological development and demonstration. You may refer to our extensive <a href='https://osl.etsi.org/ecosystem/'>ecosystem</a> for further details.</div><div class='font-weight-light'>Openslice by ETSI running OSL version 2024Q4 | <a href='https://osl.etsi.org/files/SDG_OSL_Terms_and_Conditions.pdf' class='font-weight-light'>Terms and Conditions</a> | &copy; 2025 on behalf of <a target='_blank' href='https://osl.etsi.org/' title='osl.etsi.org' class='font-weight-light'>osl.etsi.org</a></div></div></div>"
 }
\ No newline at end of file