diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20c7a6c9adbbf8ac7b06e5b7295f0a3fd225da6f..51b5aeae08c6251003ed09cd0f6e78553ae0baf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,177 @@
+### 12.1.0 Resolve problems with d3v7
+* 94e68f6 -- [CI/CD] Update packages.json version based on GitLab tag.
+*   1a8ee57 -- Merge branch '68-fix-d3-update-problems' into 'master'
+|\  
+| * 5b2326a -- Resolve "Fix d3 update problems"
+|/  
+* 24a0832 -- [CI/CD] CHANGELOG.md file updated with commits between the current and previous tag.
+* a94fa35 -- [CI/CD] Update packages.json version based on GitLab tag.
+*   43fec16 -- Merge branch '67-bump-version-of-d3' into 'master'
+|\  
+| * 71ff3c3 -- Resolve "Bump version of d3"
+|/  
+*   0e41628 -- Merge branch '65-add-posibility-to-emit-and-consume-events-for-player-highlight' into 'master'
+|\  
+| * fd59781 -- Resolve "Add posibility to emit and consume events for player highlight"
+|/  
+*   b304d69 -- Merge branch '66-add-license-file' into 'master'
+|\  
+| * e034962 -- Add license file
+|/  
+* e3943ec -- [CI/CD] CHANGELOG.md file updated with commits between the current and previous tag.
+* 2b61d15 -- [CI/CD] Update packages.json version based on GitLab tag.
+*   611a067 -- Merge branch '64-create-tag-with-latest-changes' into 'master'
+|\  
+| * 53fde3b -- Tag message
+|/  
+*   ab55018 -- Merge branch '63-fix-estimated-time-bar' into 'master'
+|\  
+| * 9644433 -- Fix estimated time bars
+|/  
+* a3cb303 -- [CI/CD] CHANGELOG.md file updated with commits between the current and previous tag.
+* d391685 -- [CI/CD] Update packages.json version based on GitLab tag.
+*   aebcaf5 -- Merge branch '62-create-tag-with-latest-changes' into 'master'
+|\  
+| * 85502ca -- Tag notes
+|/  
+*   7f2bfcf -- Merge branch '60-add-new-features-visible-from-the-trainee-view' into 'master'
+|\  
+| * 9c87191 -- Resolve "Add new features visible from the trainee view"
+|/  
+* f29cad5 -- [CI/CD] CHANGELOG.md file updated with commits between the current and previous tag.
+* eea8901 -- [CI/CD] Update packages.json version based on GitLab tag.
+* 2954d38 -- Update VERSION.txt
+*   9f95530 -- Merge branch '61-rename-terms-that-have-been-changed-on-backend' into 'master'
+|\  
+| * 8cda2bf -- Renaming flag to answer and game level to training level.
+|/  
+*   4540fc8 -- Merge branch '59-add-build-example-app-to-ci' into 'master'
+|\  
+| * c052ec6 -- Add build example app
+|/  
+*   ed6cdd5 -- Merge branch '58-fix-local-config-paths' into 'master'
+|\  
+| * add23b5 -- Fix paths
+|/  
+* f0807fc -- [CI/CD] CHANGELOG.md file updated with commits between the current and previous tag.
+* 02d812b -- [CI/CD] Update packages.json version based on GitLab tag.
+*   01258f2 -- Merge branch '57-bump-version' into 'master'
+|\  
+| * e626493 -- Bumped version
+|/  
+* 1725e8f -- [CI/CD] CHANGELOG.md file updated with commits between the current and previous tag.
+* 97dc78d -- [CI/CD] Update packages.json version based on GitLab tag.
+*   e75e60e -- Merge branch '56-bump-version' into 'master'
+|\  
+| * 7ce1265 -- Bump version
+|/  
+*   7fa91f4 -- Merge branch '54-fix-filtering-and-add-spinner' into 'master'
+|\  
+| * 8e303b8 -- Resolve "Fix filtering and add spinner"
+|/  
+* ab705bb -- [CI/CD] CHANGELOG.md file updated with commits between the current and previous tag.
+* 97140c8 -- [CI/CD] Update packages.json version based on GitLab tag.
+*   ea2e257 -- Merge branch '55-simplify-gitlab-ci-cd-using-csirt-mu-docker-image' into 'master'
+|\  
+| * 7368115 -- Update gitlab CI
+|/  
+* 8f45faa -- Update project package.json version based on GitLab tag. Done by CI
+*   ad4408f -- Merge branch '52-create-json-server' into 'master'
+|\  
+| * 503be9f -- Resolve "Create JSON server"
+* | dd803eb -- Update project package.json version based on GitLab tag. Done by CI
+* |   4ae9a12 -- Merge branch '53-fix-traineemodeinfo' into 'master'
+|\ \  
+| |/  
+|/|   
+| * 064ca2c -- Fix traineeModeInfo
+|/  
+* eb6fa51 -- Update project package.json version based on GitLab tag. Done by CI
+*   4dbca39 -- Merge branch '51-update-to-angular-12' into 'master'
+|\  
+| * 5629901 -- Resolve "Update to Angular 12"
+|/  
+*   e2a1e32 -- Merge branch '49-refactor-visualizations' into 'master'
+|\  
+| * 4eeaede -- Resolve "Refactor visualizations"
+|/  
+*   91d1957 -- Merge branch '50-update-oidc-configuration' into 'master'
+|\  
+| * 58b69b0 -- Resolve "Update oidc configuration"
+|/  
+* 9e00f99 -- Update project package.json version based on GitLab tag. Done by CI
+*   845730a -- Merge branch '48-update-to-angular-11' into 'master'
+|\  
+| * 47aebba -- Resolve "Update to Angular 11"
+|/  
+*   79d7729 -- Merge branch '47-recreate-package-lock-for-new-package-registry' into 'master'
+|\  
+| * 9dfbcf8 -- Resolve "Recreate package lock for new package registry"
+|/  
+*   78dc582 -- Merge branch '46-migrate-from-tslint-to-eslint' into 'master'
+|\  
+| * 9f43993 -- Resolve "Migrate from tslint to eslint"
+|/  
+* 7f4d269 -- Update project package.json version based on GitLab tag. Done by CI
+*   53857c6 -- Merge branch '45-rename-package-scope-to-muni-kypo-crp' into 'master'
+|\  
+| * b5619c6 -- Rename package scope and update dependencies
+|/  
+* a8c7140 -- Update project package.json version based on GitLab tag. Done by CI
+*   fb27030 -- Merge branch '44-update-dependencies-to-new-format' into 'master'
+|\  
+| * efaf691 -- Update dependencies
+|/  
+* 03841c0 -- Update project package.json version based on GitLab tag. Done by CI
+*   046cb33 -- Merge branch '43-rename-package-to-kypo-overview-visualization' into 'master'
+|\  
+| * 4f270b7 -- Rename the package
+|/  
+* d5f36d3 -- Update project package.json version based on GitLab tag. Done by CI
+*   2b82ea6 -- Merge branch '42-remove-tooltips' into 'master'
+|\  
+| * 7ed5145 -- Resolve "Remove tooltips"
+|/  
+* 3e50c79 -- Delete VERSION.txt
+*   6033868 -- Merge branch '41-overview-visualization-page-does-not-display' into 'master'
+|\  
+| * e9ee3c0 -- Resolve "Overview visualization page does not display"
+|/  
+*   dafd208 -- Merge branch '40-clear-personal-data-of-developers-from-the-source-code' into 'master'
+|\  
+| * a867dc6 -- Remove personal data
+| * f36fef9 -- Remove personal data
+|/  
+* 93e6e23 -- Update project package.json version based on GitLab tag. Done by CI
+*   fb29035 -- Merge branch '39-replace-dependency-on-kypo2-auth-with-sentinel-auth' into 'master'
+|\  
+| * 14f2f7d -- Resolve "Replace dependency on kypo2-auth with sentinel-auth"
+|/  
+* 6c1c037 -- Update project package.json version based on GitLab tag. Done by CI
+*   a1904ad -- Merge branch '37-update-endpoint-for-training-events' into 'master'
+|\  
+| * 28a4c88 -- Updated training-events to training-platform-events to match new backend endpoint
+|/  
+*   4af6287 -- Merge branch '36-use-cypress-image-in-ci' into 'master'
+|\  
+| * bb2c14e -- Resolve "Use Cypress image in CI"
+|/  
+* 5dc6a08 -- Update project package.json version based on GitLab tag. Done by CI
+*   dce41e0 -- Merge branch '35-update-config-to-support-new-elasticsearch-backend-service' into 'master'
+|\  
+| * 14cd806 -- Resolve "Update config to support new elasticsearch backend service"
+|/  
+* 460af69 -- Update project package.json version based on GitLab tag. Done by CI
+*   c5d967a -- Merge branch '34-update-to-angular-10' into 'master'
+|\  
+| * 0f122ac -- Resolve "Update to Angular 10"
+|/  
+*   c7db29b -- Merge branch '33-make-the-ci-build-stage-build-with-prod-param' into 'master'
+|\  
+| * 4a75c4a -- Resolve "Make the CI build stage build with prod param"
+|/  
+* 2e159c5 -- Merge branch 'xhamern2-master-patch-44047' into 'master'
+* 70f2618 -- Remove package-lock from gitignore
 ### 12.0.9 Update to d3v7
 * a94fa35 -- [CI/CD] Update packages.json version based on GitLab tag.
 *   43fec16 -- Merge branch '67-bump-version-of-d3' into 'master'