diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f81269..4e6d94f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ---
 
 ## [Unreleased]
+### Added
+- Add workflow for genotyping from GVCFs
 ### Changed
 - Standardize description
+- Update GATK to 4.5.0.0
 
 ---
 
diff --git a/config/F16.config b/config/F16.config
index bca8986..1fb00e0 100644
--- a/config/F16.config
+++ b/config/F16.config
@@ -11,7 +11,7 @@ process {
         cpus = 1
         memory = 1.GB
     }
-    withName: run_HaplotypeCallerVCF_GATK {
+    withName: run_HaplotypeCallerGVCF_GATK {
         cpus = 2
         memory = 4.GB
         retry_strategy {
@@ -21,7 +21,17 @@ process {
             }
         }
     }
-    withName: run_HaplotypeCallerGVCF_GATK {
+    withName: run_CombineGVCFs_GATK {
+        cpus = 2
+        memory = 4.GB
+        retry_strategy {
+            memory {
+                strategy = 'exponential'
+                operand = 2
+            }
+        }
+    }
+    withName: run_GenotypeGVCFs_GATK {
         cpus = 2
         memory = 4.GB
         retry_strategy {
diff --git a/config/F32.config b/config/F32.config
index bca8986..1fb00e0 100644
--- a/config/F32.config
+++ b/config/F32.config
@@ -11,7 +11,7 @@ process {
         cpus = 1
         memory = 1.GB
     }
-    withName: run_HaplotypeCallerVCF_GATK {
+    withName: run_HaplotypeCallerGVCF_GATK {
         cpus = 2
         memory = 4.GB
         retry_strategy {
@@ -21,7 +21,17 @@ process {
             }
         }
     }
-    withName: run_HaplotypeCallerGVCF_GATK {
+    withName: run_CombineGVCFs_GATK {
+        cpus = 2
+        memory = 4.GB
+        retry_strategy {
+            memory {
+                strategy = 'exponential'
+                operand = 2
+            }
+        }
+    }
+    withName: run_GenotypeGVCFs_GATK {
         cpus = 2
         memory = 4.GB
         retry_strategy {
diff --git a/config/F72.config b/config/F72.config
index 406d896..b16f3db 100644
--- a/config/F72.config
+++ b/config/F72.config
@@ -11,7 +11,7 @@ process {
         cpus = 1
         memory = 1.GB
     }
-    withName: run_HaplotypeCallerVCF_GATK {
+    withName: run_HaplotypeCallerGVCF_GATK {
         cpus = 3
         memory = 7.GB
         retry_strategy {
@@ -21,9 +21,19 @@ process {
             }
         }
     }
-    withName: run_HaplotypeCallerGVCF_GATK {
-        cpus = 3
-        memory = 7.GB
+    withName: run_CombineGVCFs_GATK {
+        cpus = 2
+        memory = 4.GB
+        retry_strategy {
+            memory {
+                strategy = 'exponential'
+                operand = 2
+            }
+        }
+    }
+    withName: run_GenotypeGVCFs_GATK {
+        cpus = 2
+        memory = 4.GB
         retry_strategy {
             memory {
                 strategy = 'exponential'
diff --git a/config/M64.config b/config/M64.config
index 406d896..b16f3db 100644
--- a/config/M64.config
+++ b/config/M64.config
@@ -11,7 +11,7 @@ process {
         cpus = 1
         memory = 1.GB
     }
-    withName: run_HaplotypeCallerVCF_GATK {
+    withName: run_HaplotypeCallerGVCF_GATK {
         cpus = 3
         memory = 7.GB
         retry_strategy {
@@ -21,9 +21,19 @@ process {
             }
         }
     }
-    withName: run_HaplotypeCallerGVCF_GATK {
-        cpus = 3
-        memory = 7.GB
+    withName: run_CombineGVCFs_GATK {
+        cpus = 2
+        memory = 4.GB
+        retry_strategy {
+            memory {
+                strategy = 'exponential'
+                operand = 2
+            }
+        }
+    }
+    withName: run_GenotypeGVCFs_GATK {
+        cpus = 2
+        memory = 4.GB
         retry_strategy {
             memory {
                 strategy = 'exponential'
diff --git a/config/default.config b/config/default.config
index bf96ba3..806d508 100644
--- a/config/default.config
+++ b/config/default.config
@@ -16,7 +16,7 @@ params {
 
     docker_container_registry = "ghcr.io/uclahs-cds"
 
-    gatk_version = "4.2.4.1"
+    gatk_version = "4.5.0.0"
     picard_version = "2.26.10"
     pipeval_version = "4.0.0-rc.2"
     gatkfilter_version = "v1.0.0"
diff --git a/main.nf b/main.nf
index 2fd315a..33e0937 100644
--- a/main.nf
+++ b/main.nf
@@ -25,7 +25,7 @@ Current Configuration:
         bundle_omni_1000g_2p5_vcf_gz: ${params.bundle_omni_1000g_2p5_vcf_gz}
         bundle_phase1_1000g_snps_high_conf_vcf_gz: ${params.bundle_phase1_1000g_snps_high_conf_vcf_gz}
 
-    - output: 
+    - output:
         output: ${params.output_dir}
         output_dir_base: ${params.output_dir_base}
         log_output_dir: ${params.log_output_dir}
@@ -58,9 +58,10 @@ include { extract_GenomeIntervals } from './external/pipeline-Nextflow-module/mo
         ]
     )
 include {
-    run_HaplotypeCallerVCF_GATK
     run_HaplotypeCallerGVCF_GATK
     } from './module/haplotypecaller.nf'
+include { run_CombineGVCFs_GATK } from './module/combine-gvcfs.nf'
+include { run_GenotypeGVCFs_GATK } from './module/genotype-gvcfs.nf'
 include {
     run_MergeVcfs_Picard as run_MergeVcfs_Picard_VCF
     run_MergeVcfs_Picard as run_MergeVcfs_Picard_GVCF
@@ -147,51 +148,60 @@ workflow {
     /**
     *   Haplotype calling
     */
-    input_ch_collected_files.combine(input_ch_intervals)
+
+    input_ch_samples_with_index.combine(input_ch_intervals)
         .map{ it ->
             [
-                it[0].bams,
-                it[0].indices,
+                it[0].id,
+                it[0].path,
+                it[0].index,
                 it[1].interval_path,
                 it[1].interval_id
             ]
         }
-        .set{ input_ch_haplotypecallervcf }
+        .set{ input_ch_haplotypecallergvcf }
 
-    run_HaplotypeCallerVCF_GATK(
+    run_HaplotypeCallerGVCF_GATK(
         params.reference_fasta,
         "${params.reference_fasta}.fai",
         "${file(params.reference_fasta).parent}/${file(params.reference_fasta).baseName}.dict",
         params.bundle_v0_dbsnp138_vcf_gz,
         "${params.bundle_v0_dbsnp138_vcf_gz}.tbi",
-        input_ch_haplotypecallervcf
+        input_ch_haplotypecallergvcf
     )
 
-    input_ch_samples_with_index.combine(input_ch_intervals)
+    run_HaplotypeCallerGVCF_GATK.out.gvcfs
+        .groupTuple(by: 4) // Group by interval ID
         .map{ it ->
             [
-                it[0].id,
-                it[0].path,
-                it[0].index,
-                it[1].interval_path,
-                it[1].interval_id
+                it[1].flatten(), // GVCFs
+                it[2].flatten(), // Indices
+                it[3][0], // Interval path
+                it[4] // Interval ID
             ]
         }
-        .set{ input_ch_haplotypecallergvcf }
+    .set { input_ch_combine_gvcfs }
 
-    run_HaplotypeCallerGVCF_GATK(
+    run_CombineGVCFs_GATK(
+        params.reference_fasta,
+        "${params.reference_fasta}.fai",
+        "${file(params.reference_fasta).parent}/${file(params.reference_fasta).baseName}.dict",
+        input_ch_combine_gvcfs
+        )
+
+    run_GenotypeGVCFs_GATK(
         params.reference_fasta,
         "${params.reference_fasta}.fai",
         "${file(params.reference_fasta).parent}/${file(params.reference_fasta).baseName}.dict",
         params.bundle_v0_dbsnp138_vcf_gz,
         "${params.bundle_v0_dbsnp138_vcf_gz}.tbi",
-        input_ch_haplotypecallergvcf
+        run_CombineGVCFs_GATK.out.combined_gvcf
     )
 
     /**
     *   Merge VCFs
     */
-    run_HaplotypeCallerVCF_GATK.out.vcfs
+    run_GenotypeGVCFs_GATK.out.vcfs
         .reduce( ['vcfs': [], 'indices': []] ){ a, b ->
             a.vcfs.add(b[0]);
             a.indices.add(b[1]);
diff --git a/metadata.yaml b/metadata.yaml
index a771bf0..771552b 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,4 +5,4 @@ maintainers: "Boutros Lab Infrastructure <BoutrosLabInfrastructure@mednet.ucla.e
 languages: ["Nextflow", "Docker"]
 dependencies: ["Java", "Nextflow", "Docker"]
 references: "https://uclahs-cds.atlassian.net/wiki/spaces/BOUTROSLAB/pages/3189620/Guide+to+Nextflow"
-tools: ["Picard:2.26.10", "GATK:3.7.0", "GATK:4.2.4.1"]
+tools: ["Picard:2.26.10", "GATK:3.7.0", "GATK:4.5.0.0"]
diff --git a/module/combine-gvcfs.nf b/module/combine-gvcfs.nf
new file mode 100644
index 0000000..70421fe
--- /dev/null
+++ b/module/combine-gvcfs.nf
@@ -0,0 +1,48 @@
+include { generate_standard_filename } from '../external/pipeline-Nextflow-module/modules/common/generate_standardized_filename/main.nf'
+
+/*
+    Nextflow module for merging GVCFs for joint genotyping with GATK
+*/
+process run_CombineGVCFs_GATK {
+    container params.docker_image_gatk
+    publishDir path: "${params.output_dir_base}/intermediate/${task.process.replace(':', '/')}",
+        mode: "copy",
+        enabled: params.save_intermediate_files,
+        pattern: '*g.vcf.gz*'
+    publishDir path: "${params.log_output_dir}/process-log",
+        pattern: ".command.*",
+        mode: "copy",
+        saveAs: { "${task.process.replace(':', '/')}/${task.process.split(':')[-1]}-${interval_id}/log${file(it).getName()}" }
+
+    input:
+    path(reference_fasta)
+    path(reference_fasta_fai)
+    path(reference_fasta_dict)
+    tuple path(gvcfs), path(gvcf_indices), path(interval_path), val(interval_id)
+
+    output:
+    path(".command.*")
+    tuple path(output_filename), path("${output_filename}.tbi"), path(interval_path), val(interval_id), emit: combined_gvcf
+
+    script:
+    output_filename = generate_standard_filename(
+        "GATK-${params.gatk_version}",
+        params.dataset_id,
+        params.patient_id,
+        [
+            'additional_information': "${interval_id}.g.vcf.gz"
+        ]
+    )
+    gvcf_input_str = gvcfs.collect{ "--variant '${it}'" }.join(' ')
+    """
+    set -euo pipefail
+
+    gatk --java-options "-Xmx${(task.memory - params.gatk_command_mem_diff).getMega()}m" \
+        CombineGVCFs \
+        --reference ${reference_fasta} \
+        ${gvcf_input_str} \
+        --output ${output_filename} \
+        --create-output-variant-index true \
+        --verbosity INFO
+    """
+}
diff --git a/module/genotype-gvcfs.nf b/module/genotype-gvcfs.nf
new file mode 100644
index 0000000..77655d6
--- /dev/null
+++ b/module/genotype-gvcfs.nf
@@ -0,0 +1,55 @@
+include { generate_standard_filename } from '../external/pipeline-Nextflow-module/modules/common/generate_standardized_filename/main.nf'
+
+/*
+    Nextflow module for joint genotyping merged GVCFs with GATK
+*/
+process run_GenotypeGVCFs_GATK {
+    container params.docker_image_gatk
+    publishDir path: "${params.output_dir_base}/intermediate/${task.process.replace(':', '/')}",
+        mode: "copy",
+        enabled: params.save_intermediate_files,
+        pattern: '*.vcf*'
+
+    publishDir path: "${params.log_output_dir}/process-log",
+        pattern: ".command.*",
+        mode: "copy",
+        saveAs: { "${task.process.replace(':', '/')}/${task.process.split(':')[-1]}-${interval_id}/log${file(it).getName()}" }
+
+    input:
+    path(reference_fasta)
+    path(reference_fasta_fai)
+    path(reference_fasta_dict)
+    path(dbsnp_bundle)
+    path(dbsnp_bundle_index)
+    tuple path(combined_gvcf), path(combined_gvcf_index), path(interval_path), val(interval_id)
+
+    output:
+    path(".command.*")
+    tuple path(output_filename), path("${output_filename}.tbi"), emit: vcfs
+
+    script:
+    output_filename = generate_standard_filename(
+        "GATK-${params.gatk_version}",
+        params.dataset_id,
+        params.patient_id,
+        [
+            'additional_information': "${interval_id}.vcf.gz"
+        ]
+    )
+    interval_str = "--intervals ${interval_path}"
+    interval_padding = params.is_targeted ? "--interval-padding 100" : ""
+    """
+    set -euo pipefail
+
+    gatk --java-options "-Xmx${(task.memory - params.gatk_command_mem_diff).getMega()}m" \
+        GenotypeGVCFs \
+        --variant ${combined_gvcf} \
+        --reference ${reference_fasta} \
+        --verbosity INFO \
+        --output ${output_filename} \
+        --dbsnp ${dbsnp_bundle} \
+        --standard-min-confidence-threshold-for-calling 50 \
+        ${interval_str} \
+        ${interval_padding}
+    """
+}
diff --git a/module/haplotypecaller.nf b/module/haplotypecaller.nf
index e6cb95f..6aac72c 100644
--- a/module/haplotypecaller.nf
+++ b/module/haplotypecaller.nf
@@ -1,84 +1,5 @@
 include { generate_standard_filename } from '../external/pipeline-Nextflow-module/modules/common/generate_standardized_filename/main.nf'
 
-/*
-    Nextflow module for calling haplotypes in VCF mode
-
-    input:
-        reference_fasta: path to reference genome fasta file
-        reference_fasta_fai: path to index for reference fasta
-        reference_fasta_dict: path to dictionary for reference fasta
-        dbsnp_bundle: path to dbSNP variants
-        dbsnp_bundle_index: path to index of dbSNP variants
-        bams: path to BAMs for calling
-        bam_indices: path to indices of BAM
-        interval: path to specific intervals for calling
-        interval_id: interval ID
-        
-    params:
-        params.output_dir_base: string(path)
-        params.log_output_dir: string(path)
-        params.save_intermediate_files: bool.
-        params.docker_image_gatk: string
-        params.is_targeted: bool. Indicator of whether in targeted exome mode or in WGS mode
-        params.gatk_command_mem_diff: float(memory)
-*/
-process run_HaplotypeCallerVCF_GATK {
-    container params.docker_image_gatk
-    publishDir path: "${params.output_dir_base}/intermediate/${task.process.replace(':', '/')}",
-      mode: "copy",
-      enabled: params.save_intermediate_files,
-      pattern: '*.vcf*'
-
-    publishDir path: "${params.log_output_dir}/process-log",
-      pattern: ".command.*",
-      mode: "copy",
-      saveAs: { "${task.process.replace(':', '/')}/${task.process.split(':')[-1]}-${interval_id}/log${file(it).getName()}" }
-
-    input:
-    path(reference_fasta)
-    path(reference_fasta_fai)
-    path(reference_fasta_dict)
-    path(dbsnp_bundle)
-    path(dbsnp_bundle_index)
-    tuple path(bams), path(bam_indices), path(interval), val(interval_id)
-
-
-    output:
-    path(".command.*")
-    tuple path(output_filename), path("${output_filename}.tbi"), emit: vcfs
-
-    script:
-    // Get split interval number to serve as task ID
-    interval_id = interval.baseName.split('-')[0]
-    output_filename = generate_standard_filename(
-        "GATK-${params.gatk_version}",
-        params.dataset_id,
-        params.patient_id,
-        [
-            'additional_information': "${interval_id}.vcf.gz"
-        ]
-    )
-    interval_str = "--intervals ${interval}"
-    bam_input_str = bams.collect{ "--input '${it}'" }.join(' ')
-    interval_padding = params.is_targeted ? "--interval-padding 100" : ""
-    """
-    set -euo pipefail
-
-    gatk --java-options "-Xmx${(task.memory - params.gatk_command_mem_diff).getMega()}m -DGATK_STACKTRACE_ON_USER_EXCEPTION=true -Djava.io.tmpdir=${workDir}" \
-        HaplotypeCaller \
-        ${bam_input_str} \
-        --output ${output_filename} \
-        --reference ${reference_fasta} \
-        --verbosity INFO \
-        --output-mode EMIT_VARIANTS_ONLY \
-        --dbsnp ${dbsnp_bundle} \
-        --sample-ploidy 2 \
-        --standard-min-confidence-threshold-for-calling 50 \
-        ${interval_str} \
-        ${interval_padding}
-    """
-}
-
 /*
     Nextflow module for calling haplotypes in GVCF mode
 
@@ -120,12 +41,12 @@ process run_HaplotypeCallerGVCF_GATK {
     path(reference_fasta_dict)
     path(dbsnp_bundle)
     path(dbsnp_bundle_index)
-    tuple val(sample_id), path(bam), path(bam_index), path(interval), val(interval_id)
+    tuple val(sample_id), path(bam), path(bam_index), path(interval_path), val(interval_id)
 
 
     output:
     path(".command.*")
-    tuple val(sample_id), path(output_filename), path("${output_filename}.tbi"), emit: gvcfs
+    tuple val(sample_id), path(output_filename), path("${output_filename}.tbi"), path(interval_path), val(interval_id), emit: gvcfs
 
     script:
     output_filename = generate_standard_filename(
@@ -136,7 +57,7 @@ process run_HaplotypeCallerGVCF_GATK {
             'additional_information': "${interval_id}_raw_variants.g.vcf.gz"
         ]
     )
-    interval_str = "--intervals ${interval}"
+    interval_str = "--intervals ${interval_path}"
     interval_padding = params.is_targeted ? "--interval-padding 100" : ""
     output_mode = params.emit_all_confident_sites ? "EMIT_ALL_CONFIDENT_SITES" : "EMIT_VARIANTS_ONLY"
     """