diff --git a/src/main/webapp/app/home/azure-generator/azure-generator.component.ts b/src/main/webapp/app/home/azure-generator/azure-generator.component.ts
index d60f7c2c..f374eb63 100644
--- a/src/main/webapp/app/home/azure-generator/azure-generator.component.ts
+++ b/src/main/webapp/app/home/azure-generator/azure-generator.component.ts
@@ -33,6 +33,7 @@ export class AzureGeneratorComponent implements OnInit {
     hideAuthenticationType: true,
     hideHibernateCache: true,
     hideDevDatabaseType: true,
+    hideIaCTool: true,
     hideDatabaseTypeOptions: ['cassandra', 'couchbase', 'neo4j', 'no'],
     hideProdDatabaseTypeOptions: ['mysql', 'mariadb', 'oracle', 'mssql', 'cassandra', 'couchbase', 'neo4j', 'no'],
     hideDevDatabaseTypeOptions: ['h2Disk', 'h2Memory', 'mysql', 'mariadb', 'oracle', 'mssql', 'cassandra', 'couchbase', 'neo4j', 'no'],
diff --git a/src/main/webapp/app/home/generator/generator.component.html b/src/main/webapp/app/home/generator/generator.component.html
index 0e5c09cf..9cf80ac2 100644
--- a/src/main/webapp/app/home/generator/generator.component.html
+++ b/src/main/webapp/app/home/generator/generator.component.html
@@ -117,6 +117,13 @@ <h4>Server side options</h4>
                         <option value="no" [hidden]="config.disableNoDatabaseOptions == true" *ngIf="!isProdDatabaseOptionHidden('no', 'no') || !config.hideDatabaseType">No database</option>
                     </select>
                 </div>
+              <div class="form-group" *ngIf="config.hideIaCTool">
+                <label for="iaCTools">Do you want to use Infrastructure as Code tool(multiple choice)?</label>
+                <select id="iaCTools" [(ngModel)]="model.iaCTools" name="iaCTools" class="form-control"
+                        #iaCTools="ngModel" multiple>
+                  <option *ngFor="let option of iaCToolOptions" [value]="option.value">{{option.name}}</option>
+                </select>
+              </div>
                 <div class="form-group" *ngIf="!config.hideDevDatabaseType">
                     <label for="devDatabaseType">Which <i>development</i> database would you like to use?</label>
                     <select id="devDatabaseType" [(ngModel)]="model.devDatabaseType" name="devDatabaseType"
diff --git a/src/main/webapp/app/home/generator/generator.component.ts b/src/main/webapp/app/home/generator/generator.component.ts
index 614eb068..cb178884 100644
--- a/src/main/webapp/app/home/generator/generator.component.ts
+++ b/src/main/webapp/app/home/generator/generator.component.ts
@@ -48,6 +48,7 @@ export class GeneratorComponent implements OnInit {
   submitted = false;
 
   languageOptions: any;
+  iaCToolOptions: any;
 
   selectedGitProvider: string | undefined;
   selectedGitCompany: string | undefined;
@@ -123,6 +124,10 @@ export class GeneratorComponent implements OnInit {
   ngOnInit(): void {
     this.newGenerator();
     this.languageOptions = GeneratorComponent.getAllSupportedLanguageOptions();
+    this.iaCToolOptions = [
+      { name: 'Terraform', value: 'terraform' },
+      { name: 'Bicep', value: 'bicep' }
+    ];
     this.gitConfig = this.gitConfigurationService.gitConfig;
     if (this.gitConfig) {
       this.gitlabConfigured = this.gitConfig.gitlabConfigured ?? false;
diff --git a/src/main/webapp/app/home/generator/generator.configuration.model.ts b/src/main/webapp/app/home/generator/generator.configuration.model.ts
index 9a603260..bc8e8e5a 100644
--- a/src/main/webapp/app/home/generator/generator.configuration.model.ts
+++ b/src/main/webapp/app/home/generator/generator.configuration.model.ts
@@ -65,4 +65,5 @@ export interface GeneratorConfigurationModel {
   hideTestingOptions?: boolean;
   hideHibernateCache?: boolean;
   disableNoDatabaseOptions?: boolean;
+  hideIaCTool?: boolean;
 }
diff --git a/src/main/webapp/app/home/generator/jhipster.configuration.model.ts b/src/main/webapp/app/home/generator/jhipster.configuration.model.ts
index a7efede6..4992a14e 100644
--- a/src/main/webapp/app/home/generator/jhipster.configuration.model.ts
+++ b/src/main/webapp/app/home/generator/jhipster.configuration.model.ts
@@ -50,6 +50,7 @@ export class JHipsterConfigurationModel {
   public jhiPrefix = 'jhi';
   public withAdminUi = true;
   public blueprints: BlueprintModel[] = [];
+  public iaCTools = ['bicep', 'terraform'];
 
   constructor(data?: Partial<JHipsterConfigurationModel>) {
     if (data) {