diff --git a/Dockerfile b/Dockerfile
index 7f21808d2..1de69bca3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ RUN npm cache clear --force
 RUN npm config set fetch-retry-maxtimeout 120000
 RUN npm config set registry $NPM_REGISTRY_URL --location=global
 
-RUN npm install --location=global @angular/cli@13.3.10
+RUN npm install --location=global @angular/cli@14.2.12
 
 RUN npm install
 
diff --git a/package.json b/package.json
index fcf1d64c1..cfbaa3565 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "scripts": {
     "ng": "ng",
     "build": "node version.js && npm run env -s && ng build --prod --output-hashing=none",
-    "build:prod": "node --max-old-space-size=16384 ./node_modules/@angular/cli/bin/ng build --prod --output-hashing=none --base-href=/web-app/",
+    "build:prod": "node version.js && node --max-old-space-size=16384 ./node_modules/@angular/cli/bin/ng build --prod --output-hashing=none --base-href=/web-app/",
     "start": "npm run env -s && ng serve --aot --proxy-config proxy.conf.js",
     "serve:dev": "npm run env -s && ng serve",
     "serve:sw": "npm run build -s && npx http-server ./dist -p 4200",
diff --git a/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-popover.component.html b/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-popover.component.html
index 5ab6c16a1..d54622c36 100644
--- a/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-popover.component.html
+++ b/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-popover.component.html
@@ -5,7 +5,7 @@
     <div *ngFor="let job of selectedJobs">
       <mifosx-custom-parameters-table
       [displayName]="job.displayName"
-      [jobId]="job.id"
+      [jobId]="job.jobId"
       [jobParameters]="job.jobParameters"
       (retrieveData)="runSelectedJobs($event)"
       >
diff --git a/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-popover.component.ts b/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-popover.component.ts
index 1dcd424d4..cc4295f7e 100644
--- a/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-popover.component.ts
+++ b/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-popover.component.ts
@@ -20,8 +20,8 @@ export interface RunJobWithParamPayloadType {
 }
 
 export interface JobParameterType {
-  jobParameterName: string;
-  jobParameterValue: string;
+  parameterName: string;
+  parameterValue: string;
 }
 
 interface JobDataType {
diff --git a/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-table/custom-parameters-table.component.ts b/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-table/custom-parameters-table.component.ts
index 8afe2cdf7..068d71203 100644
--- a/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-table/custom-parameters-table.component.ts
+++ b/src/app/system/manage-jobs/scheduler-jobs/custom-parameters-popover/custom-parameters-table/custom-parameters-table.component.ts
@@ -27,8 +27,8 @@ export class CustomParametersTableComponent implements OnInit {
   ngOnInit(): void {
     this.updatedJobParameters = this.jobParameters;
     this.updatedJobParameters.push({
-      jobParameterName: '',
-      jobParameterValue: ''
+      parameterName: '',
+      parameterValue: ''
     });
   }
 
@@ -36,8 +36,8 @@ export class CustomParametersTableComponent implements OnInit {
     this.updatedJobParameters = [
       ...this.updatedJobParameters,
       {
-        jobParameterName: '',
-        jobParameterValue: ''
+        parameterName: '',
+        parameterValue: ''
       }
     ];
   }
diff --git a/version.js b/version.js
index 2cd3234d2..931c9ace1 100644
--- a/version.js
+++ b/version.js
@@ -1,14 +1,14 @@
 const { gitDescribeSync } = require('git-describe');
-const { version } = require('./package.json');
 const { resolve, relative } = require('path');
 const { writeFileSync } = require('fs-extra');
+const moment = require('moment');
 
 const gitInfo = gitDescribeSync({
     dirtyMark: false,
     dirtySemver: false
 });
 
-gitInfo.version = version;
+gitInfo.version = moment().format('YYMMDD');;
 
 const file = resolve(__dirname, '.', 'src', 'environments', '.env.ts');
 writeFileSync(file,